diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-29 17:20:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-30 15:21:38 +0100 |
| commit | d7996b7637ae0bbc261c32b4f93dd07e66eeda7a (patch) | |
| tree | d207669d8ad5d713fd1f5bb75672a2a6864b7562 /tests | |
| parent | 18f42ab9b5e5b7bd9bd324af4c2ac449a5c2107e (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: I1174bb0c485eeb1ffee10bb2a523d6629c57728b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp index 138a263dff..cf6c83444e 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -2482,15 +2482,16 @@ void tst_qqmllanguage::importIncorrectCase() if (engine.importPathList() == defaultImportPathList) engine.addImportPath(testFile("lib")); - QQmlComponent component(&engine, testFileUrl("importIncorrectCase.qml")); + // Load "importIncorrectCase.qml" using wrong case + QQmlComponent component(&engine, testFileUrl("ImportIncorrectCase.qml")); QList<QQmlError> 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 \"") + testFile("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); |