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/qquickstyleselector | |
| 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/qquickstyleselector')
11 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/qquickstyleselector/ResourceStyle/Button.qml b/tests/auto/qquickstyleselector/ResourceStyle/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/ResourceStyle/Button.qml +++ b/tests/auto/qquickstyleselector/ResourceStyle/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/Button.qml b/tests/auto/qquickstyleselector/data/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/Button.qml +++ b/tests/auto/qquickstyleselector/data/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/Control.qml b/tests/auto/qquickstyleselector/data/Control.qml index 697662f6..6820b57d 100644 --- a/tests/auto/qquickstyleselector/data/Control.qml +++ b/tests/auto/qquickstyleselector/data/Control.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Control { } diff --git a/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml b/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml +++ b/tests/auto/qquickstyleselector/data/FallbackStyle/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml b/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml index 8879d93f..23699c1c 100644 --- a/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml +++ b/tests/auto/qquickstyleselector/data/FallbackStyle/Label.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Label { } diff --git a/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml b/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml +++ b/tests/auto/qquickstyleselector/data/FileSystemStyle/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/Label.qml b/tests/auto/qquickstyleselector/data/Label.qml index 8879d93f..23699c1c 100644 --- a/tests/auto/qquickstyleselector/data/Label.qml +++ b/tests/auto/qquickstyleselector/data/Label.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Label { } diff --git a/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml b/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml +++ b/tests/auto/qquickstyleselector/data/PlatformStyle/+linux/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml b/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml +++ b/tests/auto/qquickstyleselector/data/PlatformStyle/+macos/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml b/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml +++ b/tests/auto/qquickstyleselector/data/PlatformStyle/+windows/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } diff --git a/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml b/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml index ee17c230..eaeeadcd 100644 --- a/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml +++ b/tests/auto/qquickstyleselector/data/PlatformStyle/Button.qml @@ -1,2 +1,2 @@ -import QtQuick.Templates 2.1 as T +import QtQuick.Templates 2.12 as T T.Button { } |