diff options
| -rw-r--r-- | src/libs/installer/settings.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/installer/settings/tst_settings.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index ac757ee45..acc664fb4 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -88,7 +88,7 @@ static void raiseError(QXmlStreamReader &reader, const QString &error, Settings: if (xmlFile) { qWarning() << QString::fromLatin1("Ignoring following settings reader error in %1, line %2, " "column %3: %4").arg(xmlFile->fileName()).arg(reader.lineNumber()).arg(reader.columnNumber()) - .arg(reader.errorString()); + .arg(error); } else { qWarning("Ignoring following settings reader error: %s", qPrintable(error)); } diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp index dff789d2b..be42a24ae 100644 --- a/tests/auto/installer/settings/tst_settings.cpp +++ b/tests/auto/installer/settings/tst_settings.cpp @@ -136,7 +136,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); |