diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-10-21 20:23:07 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-01 17:34:29 +0000 |
commit | 1589ce3ce855833a50b4e12c86f2b9b5a83d7b02 (patch) | |
tree | eef06ccbd022e6184e38000135cff19c35fcfd15 /src/plugins/qtsupport/qtversionfactory.cpp | |
parent | c42b12c98e1b27ac7146c31fdcdbe53915cab2c8 (diff) | |
download | qt-creator-1589ce3ce855833a50b4e12c86f2b9b5a83d7b02.tar.gz |
chuck sysroot handling out of ProFileEvaluator
qmake doesn't do anything with sysroots at this level, so this code
plain does not belong here.
sysrootification is used when resolving INCLUDEPATH, which is emulating
compiler behavior. this is done by higher-level code.
Task-number: QTCREATORBUG-11944
Change-Id: Ia25f0b6ef713e9809d974e3f3e49ba308b8c933f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/qtsupport/qtversionfactory.cpp')
-rw-r--r-- | src/plugins/qtsupport/qtversionfactory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qtsupport/qtversionfactory.cpp b/src/plugins/qtsupport/qtversionfactory.cpp index 0c32f3665c..f9b57c05d7 100644 --- a/src/plugins/qtsupport/qtversionfactory.cpp +++ b/src/plugins/qtsupport/qtversionfactory.cpp @@ -54,7 +54,7 @@ BaseQtVersion *QtVersionFactory::createQtVersionFromQMakePath(const Utils::FileN Utils::FileName mkspec = BaseQtVersion::mkspecFromVersionInfo(versionInfo); QMakeVfs vfs; - ProFileGlobals globals; + QMakeGlobals globals; globals.setProperties(versionInfo); ProMessageHandler msgHandler(false); ProFileCacheManager::instance()->incRefCount(); |