From 2a7b8930f447aa2100e58abf6ebf208064ec0f2f Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen 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 --- tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp') diff --git a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp index 347c955e..c57cf92e 100644 --- a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp +++ b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp @@ -548,7 +548,7 @@ void tst_QQuickApplicationWindow::defaultFont() QQmlEngine engine; QQmlComponent component(&engine); - component.setData("import QtQuick.Controls 2.1; ApplicationWindow { }", QUrl()); + component.setData("import QtQuick.Controls; ApplicationWindow { }", QUrl()); QScopedPointer window; window.reset(static_cast(component.create())); @@ -748,7 +748,7 @@ void tst_QQuickApplicationWindow::clearFocusOnDestruction() { if (QOperatingSystemVersion::current() <= QOperatingSystemVersion::Windows7) QSKIP("Test requires a version of Windows newer than 7: QTBUG-84443"); - if (!canImportModule("import QtGraphicalEffects 1.15; DropShadow {}")) + if (!canImportModule("import QtGraphicalEffects; DropShadow {}")) QSKIP("Test requires QtGraphicalEffects"); QQmlEngine engine; @@ -862,7 +862,7 @@ void tst_QQuickApplicationWindow::componentComplete() QQmlEngine engine; QQmlComponent component(&engine); - component.setData("import QtQuick.Controls 2.2; ApplicationWindow { }", QUrl()); + component.setData("import QtQuick.Controls; ApplicationWindow { }", QUrl()); FriendlyApplicationWindow *qmlWindow = static_cast(component.beginCreate(engine.rootContext())); QVERIFY(qmlWindow); -- cgit v1.2.3