diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-23 15:18:14 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-06-07 09:41:44 +0000 |
| commit | a4a570e813c72e308dd0897bcf256d19fee471a3 (patch) | |
| tree | ebd5a11a6fba9b82222a188cbecbb8db16700b71 /tests/auto/qquickstyle/tst_qquickstyle.cpp | |
| parent | dcf711bdce97778874e6a9bb59b00a0b7d9d84a0 (diff) | |
Fix QQuickStyle::availableStyles()
Filter out macOS debug symbol (.dSYM) directories from the list
of available styles.
Task-number: QTBUG-60973
Change-Id: I5b9c3f4af946d44b1601f32bf7da699c29a86689
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/qquickstyle/tst_qquickstyle.cpp')
| -rw-r--r-- | tests/auto/qquickstyle/tst_qquickstyle.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/tests/auto/qquickstyle/tst_qquickstyle.cpp b/tests/auto/qquickstyle/tst_qquickstyle.cpp index 3487a21e..1ce2a034 100644 --- a/tests/auto/qquickstyle/tst_qquickstyle.cpp +++ b/tests/auto/qquickstyle/tst_qquickstyle.cpp @@ -97,9 +97,22 @@ void tst_QQuickStyle::environmentVariables() void tst_QQuickStyle::availableStyles() { - QStringList styles = QQuickStyle::availableStyles(); + QString path = QFINDTESTDATA("data"); + QVERIFY(!path.isEmpty()); + qputenv("QT_QUICK_CONTROLS_STYLE_PATH", path.toLocal8Bit()); + + QStringList paths = QQuickStylePrivate::stylePaths(); + QVERIFY(paths.contains(path)); + + const QStringList styles = QQuickStyle::availableStyles(); QVERIFY(!styles.isEmpty()); QCOMPARE(styles.first(), QString("Default")); + QVERIFY(!styles.contains("designer")); + + // QTBUG-60973 + for (const QString &style : styles) { + QVERIFY2(!style.endsWith(".dSYM"), qPrintable(style)); + } } QTEST_MAIN(tst_QQuickStyle) |