diff options
| author | Zhang Yunzhe <yunzhe.zhang@qt.io> | 2026-09-16 15:10:58 +0800 |
|---|---|---|
| committer | Zhang Yunzhe <yunzhe.zhang@qt.io> | 2026-09-17 07:36:47 +0000 |
| commit | 437d54573bdd968298b9595f8f1e27d6a7ec561c (patch) | |
| tree | 6f54e79b144e0faf04bf7aae6bca40a519a75aa4 | |
| parent | 9c00a9c8dc5db9d16dd971433db617b152e2eb83 (diff) | |
tst_qqmlfileselector: Exclude HarmonyOS from Linux-specific test
HarmonyOS defines Q_OS_LINUX, but QFileSelector uses "harmonyos"
as its platform selector rather than "linux". This caused the test
to incorrectly expect the +linux variant on HarmonyOS.
Exclude HarmonyOS from the Linux-specific check so that the test
falls back to the base files when no matching selector-specific
test data is available.
Fixes: QTBUG-150348
Pick-to: 6.12
Change-Id: I60e99e8b90edbe5d6809133134c4cc70e29c45dd
Reviewed-by: Shane Liu <shane.liu@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
| -rw-r--r-- | tests/auto/qml/qqmlfileselector/tst_qqmlfileselector.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlfileselector/tst_qqmlfileselector.cpp b/tests/auto/qml/qqmlfileselector/tst_qqmlfileselector.cpp index e88199de3e..ec320071c2 100644 --- a/tests/auto/qml/qqmlfileselector/tst_qqmlfileselector.cpp +++ b/tests/auto/qml/qqmlfileselector/tst_qqmlfileselector.cpp @@ -93,7 +93,7 @@ void tst_qqmlfileselector::qmldirCompatibility() QVERIFY(!engine.rootObjects().isEmpty()); QObject *object = engine.rootObjects().at(0); auto color = object->property("color").value<QColor>(); -#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) +#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID) && !defined(Q_OS_HARMONY) QCOMPARE(object->objectName(), "linux"); QCOMPARE(color, QColorConstants::Svg::blue); #elif defined(Q_OS_DARWIN) |