1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix non-qmake build of the evaluator

Browse Source 
Change-Id: Ibbd00b415318bda928b5e6f9831b214e2657e291
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qttools/769fa282ac8a4b98698dada6969452363e0eb415)
This commit is contained in:
Oswald Buddenhagen 2012-11-02 19:46:19 +01:00 committed by The Qt Project
parent a2d2b44446
commit c0764ab9a1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/library/qmakeevaluator.cpp
View File

@ -1195,7 +1195,7 @@ bool QMakeEvaluator::loadSpec()
#ifndef QT_BUILD_QMAKE #ifndef QT_BUILD_QMAKE
// Legacy support for Qt4 qmake in Qt Creator, etc. // Legacy support for Qt4 qmake in Qt Creator, etc.
if (qmakespec.isEmpty()) if (qmakespec.isEmpty())
qmakespec = QLatin1String("default-host") : QLatin1String("default"); qmakespec = m_hostBuild ? QLatin1String("default-host") : QLatin1String("default");
#endif #endif
if (IoUtils::isRelativePath(qmakespec)) { if (IoUtils::isRelativePath(qmakespec)) {
foreach (const QString &root, m_mkspecPaths) { foreach (const QString &root, m_mkspecPaths) {