diff options
author | Eike Ziller <eike.ziller@nokia.com> | 2012-01-24 11:04:39 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@nokia.com> | 2012-01-24 11:04:39 +0100 |
commit | 8f9861cd0965353834b2dcd866c19fd502ecda5e (patch) | |
tree | 8275f90466439c1ccf0dae132164751562b32963 /src/plugins/qtsupport/debugginghelperbuildtask.cpp | |
parent | e8241adae3aa160aa2e119f16f9a4b8afcdc480e (diff) | |
parent | 4345fc8c36c4df74ab05a07cf6fa073081b96d26 (diff) | |
download | qt-creator-8f9861cd0965353834b2dcd866c19fd502ecda5e.tar.gz |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
qtcreator.pri
qtcreator.pro
src/plugins/qtsupport/debugginghelperbuildtask.h
Change-Id: I6e013efa40ee4d5addcc76d6ff13e7f4fa98cc1d
Diffstat (limited to 'src/plugins/qtsupport/debugginghelperbuildtask.cpp')
-rw-r--r-- | src/plugins/qtsupport/debugginghelperbuildtask.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/plugins/qtsupport/debugginghelperbuildtask.cpp b/src/plugins/qtsupport/debugginghelperbuildtask.cpp index ecb121c044..7de48df296 100644 --- a/src/plugins/qtsupport/debugginghelperbuildtask.cpp +++ b/src/plugins/qtsupport/debugginghelperbuildtask.cpp @@ -107,6 +107,16 @@ DebuggingHelperBuildTask::DebuggingHelperBuildTask(const BaseQtVersion *version, << QLatin1String("-k"); } m_qmakeCommand = version->qmakeCommand(); + m_qmakeArguments = QStringList() << QLatin1String("-nocache"); + if (toolChain->targetAbi().os() == ProjectExplorer::Abi::MacOS + && toolChain->targetAbi().architecture() == ProjectExplorer::Abi::X86Architecture) { + // explicitly set 32 or 64 bit in case Qt is compiled with both + if (toolChain->targetAbi().wordWidth() == 32) + m_qmakeArguments << QLatin1String("CONFIG+=x86"); + else if (toolChain->targetAbi().wordWidth() == 64) { + m_qmakeArguments << QLatin1String("CONFIG+=x86_64"); + } + } m_makeCommand = toolChain->makeCommand(); m_mkspec = version->mkspec(); @@ -177,7 +187,7 @@ bool DebuggingHelperBuildTask::buildDebuggingHelper(QFutureInterface<void> &futu arguments.makeCommand = m_makeCommand; arguments.makeArguments = m_makeArguments; arguments.qmakeCommand = m_qmakeCommand; - arguments.qmakeArguments = QStringList() << QLatin1String("-nocache"); + arguments.qmakeArguments = m_qmakeArguments; arguments.targetMode = m_target; arguments.mkspec = m_mkspec; arguments.environment = m_environment; |