diff options
Diffstat (limited to 'tests/auto/snippets')
-rw-r--r-- | tests/auto/snippets/CMakeLists.txt | 1 | ||||
-rw-r--r-- | tests/auto/snippets/data/dependencies.qml | 10 | ||||
-rw-r--r-- | tests/auto/snippets/snippets.pro | 2 | ||||
-rw-r--r-- | tests/auto/snippets/tst_snippets.cpp | 13 |
4 files changed, 14 insertions, 12 deletions
diff --git a/tests/auto/snippets/CMakeLists.txt b/tests/auto/snippets/CMakeLists.txt index f5d60a40..71bec579 100644 --- a/tests/auto/snippets/CMakeLists.txt +++ b/tests/auto/snippets/CMakeLists.txt @@ -19,6 +19,7 @@ qt_add_test(tst_snippets Qt::Gui Qt::Quick Qt::QuickControls2 + Qt::QuickControls2Private TESTDATA ${test_data} ) diff --git a/tests/auto/snippets/data/dependencies.qml b/tests/auto/snippets/data/dependencies.qml index 0fe2dbf0..8785d0b0 100644 --- a/tests/auto/snippets/data/dependencies.qml +++ b/tests/auto/snippets/data/dependencies.qml @@ -1,7 +1,7 @@ -import QtQuick 2.12 -import QtQuick.Layouts 1.12 -import QtQuick.Controls 2.12 -import QtQuick.Controls.Material 2.12 -import QtQuick.Controls.Universal 2.12 +import QtQuick +import QtQuick.Layouts +import QtQuick.Controls +import QtQuick.Controls.Material +import QtQuick.Controls.Universal Control { } diff --git a/tests/auto/snippets/snippets.pro b/tests/auto/snippets/snippets.pro index 6f366f23..9fa65055 100644 --- a/tests/auto/snippets/snippets.pro +++ b/tests/auto/snippets/snippets.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = tst_snippets -QT += quick quickcontrols2 testlib +QT += quick quickcontrols2 quickcontrols2-private testlib CONFIG += testcase macos:CONFIG -= app_bundle diff --git a/tests/auto/snippets/tst_snippets.cpp b/tests/auto/snippets/tst_snippets.cpp index 107759ce..1c420edb 100644 --- a/tests/auto/snippets/tst_snippets.cpp +++ b/tests/auto/snippets/tst_snippets.cpp @@ -36,7 +36,8 @@ #include <QtTest> #include <QtQuick> -#include <QtQuickControls2> +#include <QtQuickControls2/qquickstyle.h> +#include <QtQuickControls2/private/qquickstyle_p.h> typedef QPair<QString, QString> QStringPair; @@ -114,14 +115,14 @@ void tst_Snippets::verify() if (takeScreenshots) { const QString currentDataTag = QLatin1String(QTest::currentDataTag()); static const QString applicationStyle = QQuickStyle::name().isEmpty() ? "Default" : QQuickStyle::name(); - static const QStringList availableStyles = QQuickStyle::availableStyles(); + static const QStringList builtInStyles = QQuickStylePrivate::builtInStyles(); bool isStyledSnippet = false; const QString snippetStyle = currentDataTag.section("-", 1, 1); - for (const QString &availableStyle : availableStyles) { - if (!snippetStyle.compare(availableStyle, Qt::CaseInsensitive)) { - if (applicationStyle != availableStyle) - QSKIP(qPrintable(QString("%1 style specific snippet. Running with the %2 style.").arg(availableStyle, applicationStyle))); + for (const QString &style : builtInStyles) { + if (!snippetStyle.compare(style, Qt::CaseInsensitive)) { + if (applicationStyle != style) + QSKIP(qPrintable(QString("%1 style specific snippet. Running with the %2 style.").arg(style, applicationStyle))); isStyledSnippet = true; } } |