diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-10 16:47:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-10 16:47:26 +0100 |
| commit | efa04c2ae8427c70848477ace3d8f6e82baaab11 (patch) | |
| tree | c0394c9cd5ce51961337a7a15e169074dd41632b /tests/auto/calendar | |
| parent | 9c7429219d36e8eb40e1fe6e679715c89209fc40 (diff) | |
| parent | 6476de0b669162cf08c11f5c8d5ad0b42419f365 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
src/imports/controls/qtquickcontrols2plugin.cpp
Change-Id: I27f1260b539354e084beb28be78385e57fda63e1
Diffstat (limited to 'tests/auto/calendar')
| -rw-r--r-- | tests/auto/calendar/data/tst_calendarmodel.qml | 2 | ||||
| -rw-r--r-- | tests/auto/calendar/data/tst_dayofweekrow.qml | 2 | ||||
| -rw-r--r-- | tests/auto/calendar/data/tst_monthgrid.qml | 2 | ||||
| -rw-r--r-- | tests/auto/calendar/data/tst_weeknumbercolumn.qml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/calendar/data/tst_calendarmodel.qml b/tests/auto/calendar/data/tst_calendarmodel.qml index ea9933f1..ccadd488 100644 --- a/tests/auto/calendar/data/tst_calendarmodel.qml +++ b/tests/auto/calendar/data/tst_calendarmodel.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import QtQml 2.2 import Qt.labs.calendar 1.0 diff --git a/tests/auto/calendar/data/tst_dayofweekrow.qml b/tests/auto/calendar/data/tst_dayofweekrow.qml index a62d3d5f..f6615f78 100644 --- a/tests/auto/calendar/data/tst_dayofweekrow.qml +++ b/tests/auto/calendar/data/tst_dayofweekrow.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.calendar 1.0 diff --git a/tests/auto/calendar/data/tst_monthgrid.qml b/tests/auto/calendar/data/tst_monthgrid.qml index e524f53e..25c8378b 100644 --- a/tests/auto/calendar/data/tst_monthgrid.qml +++ b/tests/auto/calendar/data/tst_monthgrid.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.calendar 1.0 diff --git a/tests/auto/calendar/data/tst_weeknumbercolumn.qml b/tests/auto/calendar/data/tst_weeknumbercolumn.qml index 29f458ca..f94fed43 100644 --- a/tests/auto/calendar/data/tst_weeknumbercolumn.qml +++ b/tests/auto/calendar/data/tst_weeknumbercolumn.qml @@ -48,7 +48,7 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 import Qt.labs.calendar 1.0 |