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

consistently use source and build roots for mkspec & feature searches

Browse Source 
follow suit with qmake ...

Change-Id: I508039840372a9f53616e8a665aa4cae619983f6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-06-18 11:51:26 +02:00
parent be47cd2e96
commit 5b788ea23f
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/shared/proparser/qmakeevaluator.cpp
View File

@@ -1232,10 +1232,14 @@ QStringList QMakeEvaluator::qmakeMkspecPaths() const
foreach (const QString &it, m_option->getPathListEnv(QLatin1String("QMAKEPATH")))
ret << it + concat;
QString builtIn = propertyValue(QLatin1String("QT_INSTALL_DATA"), false) + concat;
if (!ret.contains(builtIn))
ret << builtIn;
if (!m_buildRoot.isEmpty())
ret << m_buildRoot + concat;
if (!m_sourceRoot.isEmpty())
ret << m_sourceRoot + concat;
ret << propertyValue(QLatin1String("QT_INSTALL_DATA"), false) + concat;
ret.removeDuplicates();
return ret;
}
@@ -1253,11 +1257,10 @@ QStringList QMakeEvaluator::qmakeFeaturePaths() const
m_option->dirlist_sep, QString::SkipEmptyParts);
QStringList feature_bases;
if (!m_cachefile.isEmpty()) {
QString path = m_cachefile.left(m_cachefile.lastIndexOf((ushort)'/'));
feature_bases << path;
}
if (!m_buildRoot.isEmpty())
feature_bases << m_buildRoot;
if (!m_sourceRoot.isEmpty())
feature_bases << m_sourceRoot;
foreach (const QString &item, m_option->getPathListEnv(QLatin1String("QMAKEPATH")))
feature_bases << (item + mkspecs_concat);