summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2012-02-23 15:14:01 +0200
committerQt by Nokia <qt-info@nokia.com>2012-02-23 14:59:07 +0100
commit6b96c229a5f04599c511843ce0fb8041a74c56b9 (patch)
tree8150436ff3ed3a4be222ae3a0a269b2a013bca2f /tests/auto/declarative
parent4137f51df6d4223c0bfcd87c40bed258fb1d14fd (diff)
Windows: Fix qdeclarativemoduleplugin test
The failure was caused by drive letter being wrong case. The whole QVERIFY here was pointless, as all it was doing was verifying what QTest::qFindTestData() returned earlier when resolving the imports directory (path variable), which is in no way relevant to this test - especially as the drive letter case is anyway fixed on the next line. Removed the unnecessary QVERIFY and added equivalent if statement to fix the drive letter case only if it is wrong. Task-number: QTBUG-24471 Change-Id: I15c9fdd5c451723e7e877709280d7483fc769c32 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Diffstat (limited to 'tests/auto/declarative')
-rw-r--r--tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
index f24052fb..9f186102 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
@@ -188,7 +188,7 @@ void tst_qdeclarativemoduleplugin::importPluginWithQmlFile()
// QTBUG-16885: adding an import path with a lower-case "c:" causes assert failure
// (this only happens if the plugin includes pure QML files)
#ifdef Q_OS_WIN
- QVERIFY(path.at(0).isUpper() && path.at(1) == QLatin1Char(':'));
+ if (path.size() > 1 && path.at(0).isUpper() && path.at(1) == QLatin1Char(':'))
path = path.at(0).toLower() + path.mid(1);
#endif