diff options
| author | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-09-04 10:38:35 +0200 |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@qt.io> | 2020-09-04 10:54:51 +0200 |
| commit | 2a7b8930f447aa2100e58abf6ebf208064ec0f2f (patch) | |
| tree | 6d2a2bdc89f4fe69e3e158bfd5701810d3533eda /tests/auto/font/tst_font.cpp | |
| parent | 574533ec25c46a6c573499a1150c231fa3d5e15a (diff) | |
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>
Diffstat (limited to 'tests/auto/font/tst_font.cpp')
| -rw-r--r-- | tests/auto/font/tst_font.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/font/tst_font.cpp b/tests/auto/font/tst_font.cpp index b9371c12..2bee1dce 100644 --- a/tests/auto/font/tst_font.cpp +++ b/tests/auto/font/tst_font.cpp @@ -73,7 +73,7 @@ static QFont testFont() { QQmlEngine engine; QQmlComponent component(&engine); - component.setData("import QtQuick 2.0; import QtQuick.Controls 2.0; Text { }", QUrl()); + component.setData("import QtQuick; import QtQuick.Controls; Text { }", QUrl()); QScopedPointer<QObject> object(component.create()); Q_ASSERT_X(!object.isNull(), "testFont", qPrintable(component.errorString())); @@ -298,7 +298,7 @@ void tst_font::defaultFont() QQmlEngine engine; QQmlComponent component(&engine); - component.setData(QString("import QtQuick.Controls 2.2; %1 { }").arg(control).toUtf8(), QUrl()); + component.setData(QString("import QtQuick.Controls; %1 { }").arg(control).toUtf8(), QUrl()); // The call to setData() above causes QQuickDefaultTheme to be set as the current theme, // so we must make sure we only set our theme afterwards. |