diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2011-08-15 11:59:20 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-08-15 12:20:50 +0200 |
| commit | 5c429665e48b98ce424a15af7f7addf20ea843d9 (patch) | |
| tree | 0fcf67c40edeaceb78ac97ff95a1ccea82268f0c /src/libs/utils/buildablehelperlibrary.cpp | |
| parent | 4274439d45c16c7456e0749c12f3a8f297672cef (diff) | |
| download | qt-creator-5c429665e48b98ce424a15af7f7addf20ea843d9.tar.gz | |
DebuggingHelpers: Pass mkspec on command line
We didn't pass actually the targetMode and mkspec to qmake. E.g.
on Mac, debugging helpers therefore couldn't compile if the default
qmake mkspec is xcode.
Task-number: QTCREATORBUG-5806
Change-Id: I575012386983e1e285a500f99a34b7f21dcba29d
Reviewed-on: http://codereview.qt.nokia.com/2947
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/libs/utils/buildablehelperlibrary.cpp')
| -rw-r--r-- | src/libs/utils/buildablehelperlibrary.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp index bf2e79c850..f3f99ae292 100644 --- a/src/libs/utils/buildablehelperlibrary.cpp +++ b/src/libs/utils/buildablehelperlibrary.cpp @@ -276,9 +276,9 @@ bool BuildableHelperLibrary::buildHelper(const BuildHelperArguments &arguments, log->append(newline); log->append(QCoreApplication::translate("ProjectExplorer::BuildableHelperLibrary", "Running %1 %2 ...\n").arg(arguments.qmakeCommand, - arguments.qmakeArguments.join(" "))); + qmakeArgs.join(" "))); - if (!runBuildProcess(proc, arguments.qmakeCommand, arguments.qmakeArguments, 30000, false, log, errorMessage)) + if (!runBuildProcess(proc, arguments.qmakeCommand, qmakeArgs, 30000, false, log, errorMessage)) return false; log->append(newline); if (makeFullPath.isEmpty()) { |