feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

DebuggingHelper: Build with right architecture even for Mac universal

Browse Source 
Task-number: QTCREATORBUG-6737

Change-Id: Ic4f814aa031902570310aad156e4b2ca9b2d3c26
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Kai Koehne
2012-01-05 13:49:22 +01:00
parent 1bdb4a69c9
commit 007cb7eccb
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qtsupport/debugginghelperbuildtask.cpp
View File

@@ -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;

1
src/plugins/qtsupport/debugginghelperbuildtask.h
View File

@@ -89,6 +89,7 @@ private:
QString m_qtInstallData;
QString m_target;
QString m_qmakeCommand;
QStringList m_qmakeArguments;
QString m_makeCommand;
QStringList m_makeArguments;
QString m_mkspec;