diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-05 09:19:45 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-05 09:19:46 +0100 |
| commit | 86f09add213e5067602f4bdf0cf659d693f03918 (patch) | |
| tree | 38eda1246edccab49bd4ecc952f8ea887983c3a1 /tests/auto/controls/data/tst_scrollview.qml | |
| parent | 05597ef3e576a7cc09d193cb46dba490b7886ec1 (diff) | |
| parent | d3545dbdfdb30e310c6c962ba92f4fdf57354666 (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: I7fe9e74beff3cdbfbf02ee0f129a8204ad31046e
Diffstat (limited to 'tests/auto/controls/data/tst_scrollview.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_scrollview.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml index a06072e5..4d5b1e5b 100644 --- a/tests/auto/controls/data/tst_scrollview.qml +++ b/tests/auto/controls/data/tst_scrollview.qml @@ -48,9 +48,9 @@ ** ****************************************************************************/ -import QtQuick 2.2 +import QtQuick 2.12 import QtTest 1.0 -import QtQuick.Controls 2.2 +import QtQuick.Controls 2.12 TestCase { id: testCase |