diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-07-16 16:31:45 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-17 01:10:08 +0200 |
| commit | d6bd6cd323f91b9cb01d94c560cf8b40dafeb790 (patch) | |
| tree | 811da51d1f28c0c4413ee7fe83fe4c909f704742 /tests/auto/qml/qqmllanguage | |
| parent | af4fbcbf901ad0ee48bdd0121769db4dc3c07452 (diff) | |
Improved error message wording
When a qmldir contains multiple definitions with the same name and
version numbers, the error message should indicate that the problem is
localized to that qmldir file.
Change-Id: I02cd4862c9ead2fd7ed1c75d0fa6949ab3eda6f6
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'tests/auto/qml/qqmllanguage')
| -rw-r--r-- | tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp index 187815688d..2c9593bd01 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -2196,12 +2196,12 @@ void tst_qqmllanguage::importsInstalled_data() << "import com.nokia.installedtest1 1.0\n" "Test {}" << "" - << "\"Test\" version 1.0 is already defined in module \"com.nokia.installedtest1\""; + << "\"Test\" version 1.0 is defined more than once in module \"com.nokia.installedtest1\""; QTest::newRow("installed import version JS clash") << "import com.nokia.installedtest2 1.0\n" "Test {}" << "" - << "\"Test\" version 1.0 is already defined in module \"com.nokia.installedtest2\""; + << "\"Test\" version 1.0 is defined more than once in module \"com.nokia.installedtest2\""; } void tst_qqmllanguage::importsInstalled() |