summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2013-04-11 15:22:02 +0200
committerTim Jenssen <tim.jenssen@digia.com>2013-04-11 15:22:36 +0200
commit8ae8ef94ce71a5492fd83e2833f3074beef684da (patch)
tree0858bb11cf9f92eb669230ee1d87e24e0522a2ee
parent9c324a7d9e13ddf430381b1a2aa329189748d3c5 (diff)
parent27161960daec42cb81bdf2c4629ed59cfeafca9e (diff)
Merge remote-tracking branch 'origin/1.3'
-rw-r--r--src/libs/installer/binaryformat.cpp6
-rw-r--r--src/libs/installer/settings.cpp2
-rw-r--r--tests/auto/installer/settings/tst_settings.cpp2
-rw-r--r--tools/common/repositorygen.cpp2
4 files changed, 8 insertions, 4 deletions
diff --git a/src/libs/installer/binaryformat.cpp b/src/libs/installer/binaryformat.cpp
index 5022b25a7..c5168dcb8 100644
--- a/src/libs/installer/binaryformat.cpp
+++ b/src/libs/installer/binaryformat.cpp
@@ -1079,8 +1079,10 @@ int BinaryContent::registerPerformedOperations()
for (int i = 0; i < d->m_performedOperationsData.count(); ++ i) {
const QPair<QString, QString> opPair = d->m_performedOperationsData.at(i);
QScopedPointer<Operation> op(KDUpdater::UpdateOperationFactory::instance().create(opPair.first));
- Q_ASSERT_X(!op.isNull(), __FUNCTION__, QString::fromLatin1("Invalid operation name: %1.")
- .arg(opPair.first).toLatin1());
+ if (op.isNull()) {
+ qWarning() << QString::fromLatin1("Failed to load unknown operation %1").arg(opPair.first);
+ continue;
+ }
if (!op->fromXml(opPair.second)) {
qWarning() << "Failed to load XML for operation:" << opPair.first;
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp
index 454edd481..2635dc10c 100644
--- a/src/libs/installer/settings.cpp
+++ b/src/libs/installer/settings.cpp
@@ -90,7 +90,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 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);
diff --git a/tools/common/repositorygen.cpp b/tools/common/repositorygen.cpp
index 644ab08ca..4980082b4 100644
--- a/tools/common/repositorygen.cpp
+++ b/tools/common/repositorygen.cpp
@@ -286,6 +286,8 @@ void QInstallerTools::copyMetaData(const QString &_targetDir, const QString &met
QDomElement fileElement = doc.createElement(QLatin1String("UpdateFile"));
fileElement.setAttribute(QLatin1String("UncompressedSize"), componentSize);
fileElement.setAttribute(QLatin1String("CompressedSize"), compressedComponentSize);
+ // adding the OS attribute to be compatible with old sdks
+ fileElement.setAttribute(QLatin1String("OS"), QLatin1String("Any"));
update.appendChild(fileElement);
root.appendChild(update);