diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-16 13:31:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-03-14 15:31:57 +0000 |
| commit | 0c621d2af5785474483b4beb4645765afe709509 (patch) | |
| tree | 83984c817e367480384e8846609234177588250f /src | |
| parent | a8a2424a7f2a29fb9b19785ae2db9405c5624433 (diff) | |
qmake: fix conditionals on the spec after assigning QMAKESPEC
Change-Id: Ibdd9a9c85067623f0f1f064d139d23b4e6b0677d
(cherry picked from qtbase/d88ff29c57b5407339da00389c522e5f1d4e3398)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/shared/proparser/qmakeevaluator.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 3009c7e87e..5d7d9c5420 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -943,6 +943,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::visitProVariable( QString spec = values(varName).first().toQString(); if (IoUtils::isAbsolutePath(spec)) { m_qmakespec = spec; + m_qmakespecName = IoUtils::fileName(m_qmakespec).toString(); m_featureRoots = 0; } } |