diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-16 13:31:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-20 10:16:37 +0000 |
| commit | d88ff29c57b5407339da00389c522e5f1d4e3398 (patch) | |
| tree | b1f3a5d2194d93e4d13e4e18075a2c815594b97d /qmake/library/qmakeevaluator.cpp | |
| parent | f2b31fdb6bb357c0c5c97d4fabd2561da3ba2093 (diff) | |
fix conditionals on the spec after assigning QMAKESPEC
this is of marginal value, as only our own code ever messes with
QMAKESPEC, and we mostly stopped matching on the spec in favor of
compiler and platform flags.
Change-Id: Ibdd9a9c85067623f0f1f064d139d23b4e6b0677d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake/library/qmakeevaluator.cpp')
| -rw-r--r-- | qmake/library/qmakeevaluator.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp index 69e216d3da..38c0cec23f 100644 --- a/qmake/library/qmakeevaluator.cpp +++ b/qmake/library/qmakeevaluator.cpp @@ -946,6 +946,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; } } |