diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-02 03:03:52 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-02 03:03:52 +0100 |
| commit | d8e0a208c9b2c28354da0fa9fc4a8e8d3131cbc2 (patch) | |
| tree | 190da6a7f59e2220aa999c36cf2bee0d0f30a225 /tests | |
| parent | 6b62b506d6eb06271e082dcedaf75fd588a5b17c (diff) | |
| parent | 46425199ebcdd4cb9facb471f67e17a941ca103f (diff) | |
| download | qtquickcontrols-d8e0a208c9b2c28354da0fa9fc4a8e8d3131cbc2.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1
Change-Id: Ib614fd58e4df83945017bbb3bf2cbc9d5a72df4c
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/controls/data/tst_calendar.qml | 8 | ||||
| -rw-r--r-- | tests/shared/qt_quick_controls_quicktest.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/controls/data/tst_calendar.qml b/tests/auto/controls/data/tst_calendar.qml index 1f8d9a8d..08bd756d 100644 --- a/tests/auto/controls/data/tst_calendar.qml +++ b/tests/auto/controls/data/tst_calendar.qml @@ -985,5 +985,13 @@ Item { compare(testcase.aysncDelegatesDestructed[i], true); } } + + function test_firstDayOfWeekAfterLocaleChange() { + calendar.selectedDate = new Date(2013, 0, 1); + calendar.locale = Qt.locale("en"); + compare(calendar.__panel.dayOfWeekHeaderRow.__repeater.model.get(0).dayOfWeek, 0) + calendar.locale = Qt.locale("fr"); + compare(calendar.__panel.dayOfWeekHeaderRow.__repeater.model.get(0).dayOfWeek, 1) + } } } diff --git a/tests/shared/qt_quick_controls_quicktest.h b/tests/shared/qt_quick_controls_quicktest.h index bf6c6559..b12cfc76 100644 --- a/tests/shared/qt_quick_controls_quicktest.h +++ b/tests/shared/qt_quick_controls_quicktest.h @@ -43,6 +43,7 @@ QT_BEGIN_NAMESPACE #define QT_QUICK_CONTROLS_TEST_MAIN(name) \ int main(int argc, char **argv) \ { \ + QTEST_SET_MAIN_SOURCE_PATH \ QtQuickControlsTestApp* app = 0; \ if (!QCoreApplication::instance()) \ app = new QtQuickControlsTestApp(argc, argv); \ |