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

Qmake: Clean up createProFileReader method of QmakeProject

Browse Source 
Change-Id: I62c55afb8a3ea4dcbe3a8a1b4387d087bb71cdea
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2017-03-01 15:14:29 +01:00
parent 5693a291e3
commit 1ca7c150d0
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -747,28 +747,25 @@ void QmakeProject::proFileParseError(const QString &errorMessage)
Core::MessageManager::write(errorMessage); Core::MessageManager::write(errorMessage);
} }
QtSupport::ProFileReader *QmakeProject::createProFileReader(const QmakeProFile *qmakeProFileNode, QtSupport::ProFileReader *QmakeProject::createProFileReader(const QmakeProFile *qmakeProFile)
QmakeBuildConfiguration *bc)
{ {
if (!m_qmakeGlobals) { if (!m_qmakeGlobals) {
m_qmakeGlobals = new QMakeGlobals; m_qmakeGlobals = new QMakeGlobals;
m_qmakeGlobalsRefCnt = 0; m_qmakeGlobalsRefCnt = 0;
Kit *k = nullptr; Kit *k = KitManager::defaultKit();
Environment env = Environment::systemEnvironment(); Environment env = Environment::systemEnvironment();
QStringList qmakeArgs; QStringList qmakeArgs;
if (!bc)
bc = activeTarget() ? static_cast<QmakeBuildConfiguration *>(activeTarget()->activeBuildConfiguration()) : nullptr;
if (bc) { if (Target *t = activeTarget()) {
k = bc->target()->kit(); k = t->kit();
env = bc->environment(); if (auto bc = static_cast<QmakeBuildConfiguration *>(t->activeBuildConfiguration())) {
if (QMakeStep *qs = bc->qmakeStep()) env = bc->environment();
qmakeArgs = qs->parserArguments(); if (QMakeStep *qs = bc->qmakeStep())
else qmakeArgs = qs->parserArguments();
qmakeArgs = bc->configCommandLineArguments(); else
} else { qmakeArgs = bc->configCommandLineArguments();
k = KitManager::defaultKit(); }
} }
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k); QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k);
@@ -808,7 +805,7 @@ QtSupport::ProFileReader *QmakeProject::createProFileReader(const QmakeProFile *
auto reader = new QtSupport::ProFileReader(m_qmakeGlobals, m_qmakeVfs); auto reader = new QtSupport::ProFileReader(m_qmakeGlobals, m_qmakeVfs);
reader->setOutputDir(qmakeProFileNode->buildDir().toString()); reader->setOutputDir(qmakeProFile->buildDir().toString());
return reader; return reader;
} }

3
src/plugins/qmakeprojectmanager/qmakeproject.h
View File

@@ -92,8 +92,7 @@ public:
void notifyChanged(const Utils::FileName &name); void notifyChanged(const Utils::FileName &name);
/// \internal /// \internal
QtSupport::ProFileReader *createProFileReader(const QmakeProFile *qmakeProFileNode, QtSupport::ProFileReader *createProFileReader(const QmakeProFile *qmakeProFile);
QmakeBuildConfiguration *bc = nullptr);
/// \internal /// \internal
QMakeGlobals *qmakeGlobals(); QMakeGlobals *qmakeGlobals();
/// \internal /// \internal