QuasarApp/installer-framework
4
0
Fork 0
mirror of https://github.com/QuasarApp/installer-framework.git synced 2025-05-13 13:29:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.3'

Browse Source 
Change-Id: Iabd77388834a27ace28587ded37c66b4c9a9cbd3
This commit is contained in:
Tim Jenssen 2013-04-11 15:22:02 +02:00
commit 8ae8ef94ce
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/installer/binaryformat.cpp
View File

@ -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;

2
src/libs/installer/settings.cpp
View File

@ -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));
}

2
tests/auto/installer/settings/tst_settings.cpp
View File

@ -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);

2
tools/common/repositorygen.cpp
View File

@ -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);