diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-04-11 15:22:02 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-04-11 15:22:36 +0200 |
| commit | 8ae8ef94ce71a5492fd83e2833f3074beef684da (patch) | |
| tree | 0858bb11cf9f92eb669230ee1d87e24e0522a2ee /tests/auto/installer | |
| parent | 9c324a7d9e13ddf430381b1a2aa329189748d3c5 (diff) | |
| parent | 27161960daec42cb81bdf2c4629ed59cfeafca9e (diff) | |
Merge remote-tracking branch 'origin/1.3'
Change-Id: Iabd77388834a27ace28587ded37c66b4c9a9cbd3
Diffstat (limited to 'tests/auto/installer')
| -rw-r--r-- | tests/auto/installer/settings/tst_settings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp index 8db9edb11..e5973ad6a 100644 --- a/tests/auto/installer/settings/tst_settings.cpp +++ b/tests/auto/installer/settings/tst_settings.cpp @@ -144,7 +144,7 @@ void tst_Settings::loadUnknownElementConfigInStrictParseMode() void tst_Settings::loadUnknownElementConfigInRelaxedParseMode() { QTest::ignoreMessage(QtWarningMsg, "\"Ignoring following settings reader error in " - ":/data/unknown_element_config.xml, line 5, column 13: \" "); + ":/data/unknown_element_config.xml, line 5, column 13: Unexpected element 'unknown'.\" "); try { Settings settings = Settings::fromFileAndPrefix(":/data/unknown_element_config.xml", ":/data", Settings::RelaxedParseMode); |