From 7d0b238bd7448071b3d191fcdf5775cfd5c7c26b Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Thu, 4 Apr 2013 10:49:33 +0200 Subject: raise an error if the root element is wrong Change-Id: I5f77ac85d6327697934cdc78d5354c6814adb6c8 Reviewed-by: Karsten Heimrich --- src/libs/installer/settings.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libs') diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index 0a2abaa9a..ac757ee45 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -228,8 +228,8 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix, QXmlStreamReader reader(&file); if (reader.readNextStartElement()) { if (reader.name() != QLatin1String("Installer")) { - raiseError(reader, QString::fromLatin1("Unexpected element '%1' as root element.").arg(reader - .name().toString()), parseMode); + reader.raiseError(QString::fromLatin1("Unexpected element '%1' as root element.").arg(reader + .name().toString())); } } QStringList elementList; -- cgit v1.2.3 From 90385dcbd6aa4172a67f31efb2f7bb6071020354 Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Tue, 9 Apr 2013 10:10:35 +0300 Subject: Fix embedded file-to-patch lists Do not patch .pri files for embedded targets. Change-Id: I52141d188f69b46203622b1e58782996529d1258 Reviewed-by: Niels Weber Reviewed-by: Tim Jenssen --- src/libs/installer/resources/files-to-patch-linux-emb-arm | 2 +- src/libs/installer/resources/files-to-patch-windows-emb-arm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libs') diff --git a/src/libs/installer/resources/files-to-patch-linux-emb-arm b/src/libs/installer/resources/files-to-patch-linux-emb-arm index ea400d715..a1ba5ccb8 100644 --- a/src/libs/installer/resources/files-to-patch-linux-emb-arm +++ b/src/libs/installer/resources/files-to-patch-linux-emb-arm @@ -4,5 +4,5 @@ bin/lrelease *.la *.prl *.pc -*.pri + diff --git a/src/libs/installer/resources/files-to-patch-windows-emb-arm b/src/libs/installer/resources/files-to-patch-windows-emb-arm index 6ff8f9903..114072689 100644 --- a/src/libs/installer/resources/files-to-patch-windows-emb-arm +++ b/src/libs/installer/resources/files-to-patch-windows-emb-arm @@ -4,4 +4,4 @@ bin/lrelease.exe *.la *.prl *.pc -*.pri + -- cgit v1.2.3 From ba4ec89c5eb3b072b9de1bdc149bba409f8fd95b Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Tue, 9 Apr 2013 10:52:19 +0200 Subject: enable Qt4 patch syntax in QtPatchOperation Change-Id: I006db8975e077d0f7391b7d273606299cc2fd19e Reviewed-by: Karsten Heimrich Reviewed-by: Niels Weber --- src/libs/installer/qtpatchoperation.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/libs') diff --git a/src/libs/installer/qtpatchoperation.cpp b/src/libs/installer/qtpatchoperation.cpp index 573db7777..9699219ec 100644 --- a/src/libs/installer/qtpatchoperation.cpp +++ b/src/libs/installer/qtpatchoperation.cpp @@ -161,7 +161,8 @@ bool QtPatchOperation::performOperation() // 2. new/target qtpath // 3. version if greather Qt4 - if (arguments().count() != 3) { + // the possible 2 argument case is here to support old syntax + if (arguments().count() < 2 || arguments().count() > 3) { setError(InvalidArguments); setErrorString(tr("Invalid arguments in %0: %1 arguments given, %2 expected%3.") .arg(name()).arg(arguments().count()).arg(tr("exactly 3"), QLatin1String(""))); -- cgit v1.2.3