AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

find features/ under mkspecs/ of source & build root

Browse Source 
we were finding features/ directly in the source & build root, and we
were finding features/ under mkspecs/ from $QMAKEPATH and other mkspecs
locations, but we omitted the "transitive hull". this was
counterintuitive.

Change-Id: I9823e6606467c98f264c81385250da92311f51ca
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-06-03 21:56:51 +02:00 committed by The Qt Project
parent da8504b2ac
commit 75aa1f0ce9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qmake/library/qmakeevaluator.cpp
View File

@ -1447,10 +1447,14 @@ void QMakeEvaluator::updateFeaturePaths()
m_option->dirlist_sep, QString::SkipEmptyParts);
QStringList feature_bases;
if (!m_buildRoot.isEmpty())
if (!m_buildRoot.isEmpty()) {
feature_bases << m_buildRoot + mkspecs_concat;
feature_bases << m_buildRoot;
if (!m_sourceRoot.isEmpty())
}
if (!m_sourceRoot.isEmpty()) {
feature_bases << m_sourceRoot + mkspecs_concat;
feature_bases << m_sourceRoot;
}
foreach (const QString &item, m_option->getPathListEnv(QLatin1String("QMAKEPATH")))
feature_bases << (item + mkspecs_concat);