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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Ic1ab71d0d40fa6c90e337c8ee9d9558e8f103eaa
This commit is contained in:
Eike Ziller
2017-12-12 10:53:51 +01:00
parent aa7995bae1 32377a9ac5
commit 469edcdde3
29 changed files with 1616 additions and 2293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -668,7 +668,8 @@ QtSupport::ProFileReader *QmakeProject::createProFileReader(const QmakeProFile *
} else {
// Set up a better default environment without using a build configuration:
QmakeBuildConfiguration::setupBuildEnvironment(k, env);
k->addToEnvironment(env);
if (k)
k->addToEnvironment(env);
}
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k);