diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-30 10:38:57 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-01 08:27:07 +0100 |
| commit | 646b60f0d3e45bcc240e5ad77a2700f4287c3162 (patch) | |
| tree | 77fa832cd9abfcee79c4057d392d140d6fa955a0 /tests/auto/declarative | |
| parent | 1246c5d3b410a29ebb306de2f6a242883187276a (diff) | |
Limit case-sensitivity check in QML to file names.
Provide for checking relative paths only; default to file names.
Currently, the checking triggers on a drive letters and
installation folder names, which is too strict.
Task-number: QTBUG-28277
Change-Id: I2056a39b605f7891d2c3e395efc6bc541aa7e470
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'tests/auto/declarative')
| -rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp index 11633c06..e201807b 100644 --- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp +++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp @@ -1818,15 +1818,16 @@ void tst_qdeclarativelanguage::importsOrder() void tst_qdeclarativelanguage::importIncorrectCase() { - QDeclarativeComponent component(&engine, testFileUrl("importIncorrectCase.qml")); + // Load "importIncorrectCase.qml" using wrong case + QDeclarativeComponent component(&engine, testFileUrl("ImportIncorrectCase.qml")); QList<QDeclarativeError> errors = component.errors(); QCOMPARE(errors.count(), 1); -#if defined(Q_OS_MAC) || defined(Q_OS_WIN32) - QString expectedError = QLatin1String("cannot load module \"com.Nokia.installedtest\": File name case mismatch for \"") + QFileInfo(__FILE__).absoluteDir().filePath("data/lib/com/Nokia/installedtest/qmldir") + QLatin1String("\""); +#if defined(Q_OS_MAC) || defined(Q_OS_WIN) + QString expectedError = QLatin1String("File name case mismatch"); #else - QString expectedError = QLatin1String("module \"com.Nokia.installedtest\" is not installed"); + QString expectedError = QLatin1String("File not found"); #endif QCOMPARE(errors.at(0).description(), expectedError); |