Merge lp://qastaging/~nick-dedekind/ubuntu-settings-components/uqmlscene into lp://qastaging/~registry/ubuntu-settings-components/trunk
Proposed by
Nick Dedekind
| Status: | Merged |
|---|---|
| Approved by: | Michał Sawicz |
| Approved revision: | 81 |
| Merged at revision: | 76 |
| Proposed branch: | lp://qastaging/~nick-dedekind/ubuntu-settings-components/uqmlscene |
| Merge into: | lp://qastaging/~registry/ubuntu-settings-components/trunk |
| Diff against target: |
1096 lines (+145/-138) 26 files modified
CMakeLists.txt (+23/-0) cmake/modules/QmlTest.cmake (+1/-1) tests/qmltests/Components/tst_Calendar.qml (+4/-6) tests/qmltests/Components/tst_StatusIcon.qml (+7/-8) tests/qmltests/Menus/tst_AccessPointMenu.qml (+6/-7) tests/qmltests/Menus/tst_ButtonMenu.qml (+4/-5) tests/qmltests/Menus/tst_CalendarMenu.qml (+3/-4) tests/qmltests/Menus/tst_CheckableMenu.qml (+4/-5) tests/qmltests/Menus/tst_EventMenu.qml (+1/-1) tests/qmltests/Menus/tst_GroupedMessageMenu.qml (+1/-3) tests/qmltests/Menus/tst_MediaPlayerMenu.qml (+4/-5) tests/qmltests/Menus/tst_PlaybackItemMenu.qml (+3/-4) tests/qmltests/Menus/tst_ProgressBarMenu.qml (+1/-1) tests/qmltests/Menus/tst_ProgressValueMenu.qml (+3/-4) tests/qmltests/Menus/tst_SectionMenu.qml (+3/-4) tests/qmltests/Menus/tst_SimpleTextMessageMenu.qml (+5/-7) tests/qmltests/Menus/tst_SliderMenu.qml (+7/-8) tests/qmltests/Menus/tst_SnapDecisionMenu.qml (+17/-19) tests/qmltests/Menus/tst_SwitchMenu.qml (+4/-5) tests/qmltests/Menus/tst_TextMessageMenu.qml (+10/-12) tests/qmltests/Menus/tst_TimeZoneMenu.qml (+3/-4) tests/qmltests/Menus/tst_TransferMenu.qml (+8/-9) tests/qmltests/Menus/tst_UserSessionMenu.qml (+4/-5) tests/qmltests/utils.js (+0/-11) tests/utils/modules/Ubuntu/Test/plugin.cpp (+18/-0) tests/utils/modules/Ubuntu/Test/plugin.h (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~nick-dedekind/ubuntu-settings-components/uqmlscene |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michał Sawicz (community) | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
| Ubuntu Unity PS integration team | packaging | Pending | |
| Andrea Cimitan | Pending | ||
|
Review via email:
|
|||
Commit message
Added ability to use try*. Added target for test files in qcreator.
Description of the change
Added ability to use try*. Added target for test files in qcreator.
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Nick Dedekind (nick-dedekind) wrote | # |
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:76
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://