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/cursor | |
| 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/cursor')
| -rw-r--r-- | tests/auto/cursor/data/buttons.qml | 4 | ||||
| -rw-r--r-- | tests/auto/cursor/data/containers.qml | 4 | ||||
| -rw-r--r-- | tests/auto/cursor/data/editable.qml | 4 | ||||
| -rw-r--r-- | tests/auto/cursor/data/pageindicator.qml | 4 | ||||
| -rw-r--r-- | tests/auto/cursor/data/scrollbar.qml | 4 | ||||
| -rw-r--r-- | tests/auto/cursor/data/sliders.qml | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/tests/auto/cursor/data/buttons.qml b/tests/auto/cursor/data/buttons.qml index 21226ef5..2107a8f3 100644 --- a/tests/auto/cursor/data/buttons.qml +++ b/tests/auto/cursor/data/buttons.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 MouseArea { width: column.width diff --git a/tests/auto/cursor/data/containers.qml b/tests/auto/cursor/data/containers.qml index 09fbbc18..c9dc09d9 100644 --- a/tests/auto/cursor/data/containers.qml +++ b/tests/auto/cursor/data/containers.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 MouseArea { width: column.width diff --git a/tests/auto/cursor/data/editable.qml b/tests/auto/cursor/data/editable.qml index 1956889b..305d7d46 100644 --- a/tests/auto/cursor/data/editable.qml +++ b/tests/auto/cursor/data/editable.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 MouseArea { width: column.width diff --git a/tests/auto/cursor/data/pageindicator.qml b/tests/auto/cursor/data/pageindicator.qml index 1e550a78..228f010d 100644 --- a/tests/auto/cursor/data/pageindicator.qml +++ b/tests/auto/cursor/data/pageindicator.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 MouseArea { width: 200 diff --git a/tests/auto/cursor/data/scrollbar.qml b/tests/auto/cursor/data/scrollbar.qml index 01dcd2ae..41fda945 100644 --- a/tests/auto/cursor/data/scrollbar.qml +++ b/tests/auto/cursor/data/scrollbar.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.0 +import QtQuick 2.12 +import QtQuick.Controls 2.12 ApplicationWindow { width: 400 diff --git a/tests/auto/cursor/data/sliders.qml b/tests/auto/cursor/data/sliders.qml index 408e8947..e3ac2cb1 100644 --- a/tests/auto/cursor/data/sliders.qml +++ b/tests/auto/cursor/data/sliders.qml @@ -48,8 +48,8 @@ ** ****************************************************************************/ -import QtQuick 2.6 -import QtQuick.Controls 2.2 +import QtQuick 2.12 +import QtQuick.Controls 2.12 MouseArea { width: column.width |