From f2064cbd7c8fbdf934130410027c271d21ba586c Mon Sep 17 00:00:00 2001 From: kh1 Date: Tue, 25 Sep 2012 11:42:30 +0200 Subject: Incorporate following changes to support Qt5. d5e0dd38ead398d5be8126b4f21c0a50b7b61b17 72000567377d52d5d6e0db2b5d5b95407d85bbc1 Change-Id: I413f6f0ace095dc0d4b375cf392f8878e97ac27c Reviewed-by: Tim Jenssen --- src/libs/installer/macrelocateqt.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/libs/installer/macrelocateqt.cpp') diff --git a/src/libs/installer/macrelocateqt.cpp b/src/libs/installer/macrelocateqt.cpp index 0647c24e1..4ffdb8bd0 100644 --- a/src/libs/installer/macrelocateqt.cpp +++ b/src/libs/installer/macrelocateqt.cpp @@ -43,7 +43,7 @@ Relocator::Relocator() { } -bool Relocator::apply(const QString &qtInstallDir, const QString &targetDir) +bool Relocator::apply(const QString &qtInstallDir, const QString &targetDir, const QString &version) { // Relocator::apply(/Users/rakeller/QtSDKtest2/Simulator/Qt/gcc) // Relocator uses indicator: /QtSDKtest2operation 'QtPatch' with arguments: 'mac; /Users/rakeller/QtSDKtest2/Simulator/Qt/gcc' failed: Error while relocating Qt: "ReplaceInsta @@ -81,11 +81,15 @@ bool Relocator::apply(const QString &qtInstallDir, const QString &targetDir) operation.setComponentRootPath(qtInstallDir); QStringList arguments; arguments << indicator - << replacement - << qtInstallDir + QLatin1String("/plugins") - << qtInstallDir + QLatin1String("/lib") - << qtInstallDir + QLatin1String("/imports") - << qtInstallDir + QLatin1String("/bin"); + << replacement; + if (version.isEmpty()) { + arguments << qtInstallDir + QLatin1String("/plugins") + << qtInstallDir + QLatin1String("/lib") + << qtInstallDir + QLatin1String("/imports") + << qtInstallDir + QLatin1String("/bin"); + } else { + arguments << qtInstallDir; + } operation.setArguments(arguments); operation.performOperation(); -- cgit v1.2.3