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

Parse the Makefile in the importing case a lot better

Browse Source 
We add each command line argument to the Additional Arguments
This commit is contained in:
dt
2009-07-22 16:52:44 +02:00
parent ecfb6eaf5a
commit cd27fdecd9
9 changed files with 237 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
View File

@@ -227,14 +227,18 @@ void Qt4ProjectConfigWidget::importLabelClicked()
version = new QtVersion(QFileInfo(qtPath).baseName(), qtPath);
vm->addVersion(version);
}
QtVersion::QmakeBuildConfig qmakeBuildConfig = version->defaultBuildConfig();
qmakeBuildConfig = QtVersionManager::scanMakefileForQmakeConfig(directory, qmakeBuildConfig);
QPair<QtVersion::QmakeBuildConfig, QStringList> result =
QtVersionManager::scanMakeFile(directory, version->defaultBuildConfig());
QtVersion::QmakeBuildConfig qmakeBuildConfig = result.first;
QStringList additionalArguments = result.second;
// So we got all the information now apply it...
m_pro->setQtVersion(m_buildConfiguration, version->uniqueId());
// Combo box will be updated at the end
// Find qmakestep...
QMakeStep *qmakeStep = m_pro->qmakeStep();
qmakeStep->setValue(m_buildConfiguration, "qmakeArgs", additionalArguments);
MakeStep *makeStep = m_pro->makeStep();
m_pro->setValue(m_buildConfiguration, "buildConfiguration", int(qmakeBuildConfig));