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

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp

Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
This commit is contained in:
Eike Ziller
2014-05-02 10:00:20 +02:00
parent f4520bafac 4b2cc015f8
commit 0fb641c90e
64 changed files with 442 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
View File

@@ -150,6 +150,12 @@ void QbsManager::addQtProfileFromKit(const QString &profileName, const ProjectEx
return;
qbs::QtEnvironment qtEnv;
const QList<ProjectExplorer::Abi> abi = qt->qtAbis();
if (!abi.empty()) {
qtEnv.architecture = ProjectExplorer::Abi::toString(abi.first().architecture());
if (abi.first().wordWidth() == 64)
qtEnv.architecture.append(QLatin1String("_64"));
}
qtEnv.binaryPath = qt->binPath().toString();
if (qt->hasDebugBuild())
qtEnv.buildVariant << QLatin1String("debug");