From 2a7b8930f447aa2100e58abf6ebf208064ec0f2f Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Date: Fri, 4 Sep 2020 10:38:35 +0200
Subject: auto tests: remove all versioning from the test data

The problem is that QtQuick.Controls.macos is only
available with revision 6.0. And when importing e.g
QtQuick.Controls 2.15, we try to load a style with the
same revision. But it simply doesn't exist. So remove
all versioning from the tests to also support testing
newer styles.

Change-Id: I666a93ab03ec4c5dcf2055a363547f8cdac8d25e
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 tests/auto/styleimports/ResourceStyle/Button.qml               | 2 +-
 tests/auto/styleimports/data/Action.qml                        | 2 +-
 tests/auto/styleimports/data/Button.qml                        | 2 +-
 tests/auto/styleimports/data/FileSystemStyle/Button.qml        | 2 +-
 tests/auto/styleimports/data/Label.qml                         | 2 +-
 tests/auto/styleimports/data/PlatformStyle/+linux/Button.qml   | 2 +-
 tests/auto/styleimports/data/PlatformStyle/+macos/Button.qml   | 2 +-
 tests/auto/styleimports/data/PlatformStyle/+windows/Button.qml | 2 +-
 tests/auto/styleimports/data/PlatformStyle/Button.qml          | 2 +-
 tests/auto/styleimports/tst_styleimports.cpp                   | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'tests/auto/styleimports')

diff --git a/tests/auto/styleimports/ResourceStyle/Button.qml b/tests/auto/styleimports/ResourceStyle/Button.qml
index 2b9e5bb7..656b27a7 100644
--- a/tests/auto/styleimports/ResourceStyle/Button.qml
+++ b/tests/auto/styleimports/ResourceStyle/Button.qml
@@ -1,4 +1,4 @@
-import QtQuick.Templates 2.15 as T
+import QtQuick.Templates as T
 T.Button {
     objectName: "ResourceStyle"
 }
diff --git a/tests/auto/styleimports/data/Action.qml b/tests/auto/styleimports/data/Action.qml
index 62501292..f49c6ff4 100644
--- a/tests/auto/styleimports/data/Action.qml
+++ b/tests/auto/styleimports/data/Action.qml
@@ -1,4 +1,4 @@
-import QtQuick.Templates 2.15 as T
+import QtQuick.Templates as T
 T.Action {
     objectName: "data"
 }
diff --git a/tests/auto/styleimports/data/Button.qml b/tests/auto/styleimports/data/Button.qml
index f67719e3..85367472 100644
--- a/tests/auto/styleimports/data/Button.qml
+++ b/tests/auto/styleimports/data/Button.qml
@@ -1,4 +1,4 @@
-import QtQuick.Templates 2.15 as T
+import QtQuick.Templates as T
 T.Button {
     objectName: "data"
 }
diff --git a/tests/auto/styleimports/data/FileSystemStyle/Button.qml b/tests/auto/styleimports/data/FileSystemStyle/Button.qml
index a5719dd8..a5078b14 100644
--- a/tests/auto/styleimports/data/FileSystemStyle/Button.qml
+++ b/tests/auto/styleimports/data/FileSystemStyle/Button.qml
@@ -1,4 +1,4 @@
-import QtQuick.Templates 2.15 as T
+import QtQuick.Templates as T
 T.Button {
     objectName: "FileSystemStyle"
 }
diff --git a/tests/auto/styleimports/data/Label.qml b/tests/auto/styleimports/data/Label.qml
index b6d434ad..3959dae8 100644
--- a/tests/auto/styleimports/data/Label.qml
+++ b/tests/auto/styleimports/data/Label.qml
@@ -1,4 +1,4 @@
-import QtQuick.Templates 2.15 as T
+import QtQuick.Templates as T
 T.Label {
     objectName: "data"
 }
diff --git a/tests/auto/styleimports/data/PlatformStyle/+linux/Button.qml b/tests/auto/styleimports/data/PlatformStyle/+linux/Button.qml
index 74e2a6f4..15c04d77 100644
--- a/tests/auto/styleimports/data/PlatformStyle/+linux/Button.qml
+++ b/tests/auto/styleimports/data/PlatformStyle/+linux/Button.qml
@@ -1,4 +1,4 @@
-import QtQuick.Templates 2.15 as T
+import QtQuick.Templates as T
 T.Button {
     objectName: "PlatformStyle/+linux"
 }
diff --git a/tests/auto/styleimports/data/PlatformStyle/+macos/Button.qml b/tests/auto/styleimports/data/PlatformStyle/+macos/Button.qml
index 47fd788b..6c07ec02 100644
--- a/tests/auto/styleimports/data/PlatformStyle/+macos/Button.qml
+++ b/tests/auto/styleimports/data/PlatformStyle/+macos/Button.qml
@@ -1,4 +1,4 @@
-import QtQuick.Templates 2.15 as T
+import QtQuick.Templates as T
 T.Button {
     objectName: "PlatformStyle/+macos"
 }
diff --git a/tests/auto/styleimports/data/PlatformStyle/+windows/Button.qml b/tests/auto/styleimports/data/PlatformStyle/+windows/Button.qml
index e5b56653..6a94679c 100644
--- a/tests/auto/styleimports/data/PlatformStyle/+windows/Button.qml
+++ b/tests/auto/styleimports/data/PlatformStyle/+windows/Button.qml
@@ -1,4 +1,4 @@
-import QtQuick.Templates 2.15 as T
+import QtQuick.Templates as T
 T.Button {
     objectName: "PlatformStyle/+windows"
 }
diff --git a/tests/auto/styleimports/data/PlatformStyle/Button.qml b/tests/auto/styleimports/data/PlatformStyle/Button.qml
index fd1dc83d..fce35efd 100644
--- a/tests/auto/styleimports/data/PlatformStyle/Button.qml
+++ b/tests/auto/styleimports/data/PlatformStyle/Button.qml
@@ -1,4 +1,4 @@
-import QtQuick.Templates 2.15 as T
+import QtQuick.Templates as T
 T.Button {
     objectName: "PlatformStyle/Button.qml"
 }
diff --git a/tests/auto/styleimports/tst_styleimports.cpp b/tests/auto/styleimports/tst_styleimports.cpp
index 7639db0e..239f5783 100644
--- a/tests/auto/styleimports/tst_styleimports.cpp
+++ b/tests/auto/styleimports/tst_styleimports.cpp
@@ -155,7 +155,7 @@ void tst_StyleImports::select()
     engine.addImportPath(dataDirectory());
     QQmlComponent component(&engine);
     const QString controlName = file.mid(0, file.indexOf(QLatin1Char('.')));
-    component.setData(QString::fromLatin1("import QtQuick 2.15; import QtQuick.Controls 2.15; %1 { }").arg(controlName).toUtf8(), QUrl());
+    component.setData(QString::fromLatin1("import QtQuick; import QtQuick.Controls; %1 { }").arg(controlName).toUtf8(), QUrl());
 
     const bool nonExistentStyle = style == QLatin1String("NoSuchStyle");
     if (nonExistentStyle)
-- 
cgit v1.2.3