diff options
| author | Tim Jenssen <tim.jenssen@digia.com> | 2013-04-09 12:40:12 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2013-04-09 12:40:36 +0200 |
| commit | 9c324a7d9e13ddf430381b1a2aa329189748d3c5 (patch) | |
| tree | d194f32035bfffc8523778e2d8a586c75526ba7e /src | |
| parent | ac2319b4f0e67da02880bdf1f8832cf3f527c252 (diff) | |
| parent | ba4ec89c5eb3b072b9de1bdc149bba409f8fd95b (diff) | |
Merge remote-tracking branch 'origin/1.3'
Change-Id: I3936ddf1e70aabc3402769d38c8a79cd50fe9077
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/qtpatchoperation.cpp | 3 | ||||
| -rw-r--r-- | src/libs/installer/resources/files-to-patch-linux-emb-arm | 2 | ||||
| -rw-r--r-- | src/libs/installer/resources/files-to-patch-windows-emb-arm | 2 | ||||
| -rw-r--r-- | src/libs/installer/settings.cpp | 4 |
4 files changed, 6 insertions, 5 deletions
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(""))); 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 + diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index 3ba85cdd6..454edd481 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -196,8 +196,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; |