Merge lp://qastaging/~nskaggs/ubuntu-ui-toolkit/add-min-max-datepicker-tests into lp://qastaging/ubuntu-ui-toolkit
Proposed by
Nicholas Skaggs
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~nskaggs/ubuntu-ui-toolkit/add-min-max-datepicker-tests |
| Merge into: | lp://qastaging/ubuntu-ui-toolkit |
| Diff against target: |
2338 lines (+726/-558) 39 files modified
debian/control (+0/-1) examples/ubuntu-ui-toolkit-gallery/Icons.qml (+3/-2) examples/ubuntu-ui-toolkit-gallery/TemplateRow.qml (+1/-1) examples/ubuntu-ui-toolkit-gallery/TextInputs.qml (+12/-0) modules/Ubuntu/Components/Icon10.qml (+15/-33) modules/Ubuntu/Components/ListItems/Empty.qml (+1/-1) modules/Ubuntu/Components/OrientationHelper.qml (+4/-1) modules/Ubuntu/Components/Popups/Dialog.qml (+40/-37) modules/Ubuntu/Components/TextArea.qml (+2/-0) modules/Ubuntu/Components/TextCursor.qml (+1/-0) modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml (+1/-0) modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml (+1/-0) modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml (+1/-0) modules/Ubuntu/Components/ToolbarItems.qml (+1/-1) modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp (+35/-50) modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h (+2/-1) modules/Ubuntu/Components/plugin/alarmmanager_p.cpp (+5/-0) modules/Ubuntu/Components/plugin/alarmmanager_p.h (+20/-18) modules/Ubuntu/Components/plugin/alarmmanager_p_p.h (+2/-0) modules/Ubuntu/Components/plugin/plugin.cpp (+0/-7) modules/Ubuntu/Components/plugin/plugin.pro (+1/-3) modules/Ubuntu/Components/plugin/thumbnailgenerator.cpp (+0/-87) modules/Ubuntu/Components/plugin/thumbnailgenerator.h (+0/-36) modules/Ubuntu/Components/plugin/ucactioncontext.h (+1/-0) modules/Ubuntu/Components/plugin/ucactionmanager.h (+1/-0) modules/Ubuntu/Components/plugin/ucscalingimageprovider.cpp (+1/-1) modules/Ubuntu/PerformanceMetrics/plugin/rendertimer.cpp (+123/-66) modules/Ubuntu/PerformanceMetrics/plugin/rendertimer.h (+4/-37) modules/Ubuntu/Test/UbuntuTestCase.qml (+23/-22) tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.py (+51/-0) tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.qml (+70/-0) tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py (+68/-20) tests/qmlapicheck.py (+3/-1) tests/qmlapicheck.sh (+14/-5) tests/uitk_test_plan.sh (+153/-88) tests/unit/add_qmlmakecheck.pri (+1/-1) tests/unit/tst_alarms/tst_alarms.cpp (+54/-37) tests/unit/tst_i18n/src/LocalizedApp.qml (+1/-1) tests/unit_x11/tst_components/tst_textarea.qml (+10/-0) |
| To merge this branch: | bzr merge lp://qastaging/~nskaggs/ubuntu-ui-toolkit/add-min-max-datepicker-tests |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Leo Arias | Pending | ||
| Ubuntu SDK team | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2014-10-16.
Commit message
Restore datepicker tests and include tests that contain the min/max properties as well (originally used to workaround bug 1328600)
Description of the change
Restore datepicker tests and include tests that contain the min/max properties as well (originally used to workaround bug 1328600)
To post a comment you must log in.
Unmerged revisions
- 1300. By Nicholas Skaggs
-
for now, comment out the dupes
- 1299. By Nicholas Skaggs
-
lazy imnplement tests with and without min/max dates in qml
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
