diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-01-30 18:37:11 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-02-06 14:52:37 +0100 |
| commit | 4e9a8232554a877b82b1a52144e83cf6a0a411c5 (patch) | |
| tree | 8b2fb7cae41dee67c0a65833e5513813d1c78743 | |
| parent | fec0a0fcd966b1283fceb68cbf686dd31608b621 (diff) | |
| download | qt-creator-4e9a8232554a877b82b1a52144e83cf6a0a411c5.tar.gz | |
don't flush qmake command line twice
otherwise variable assignments (including -config options) from
$QMAKEFLAGS are lost.
Change-Id: I818e9372d2b0ff44333dc3eb8fc3420f84ab01c5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/864e1ceaf628e823103ae2d28d2c983400ba38c7)
| -rw-r--r-- | src/shared/proparser/qmakeglobals.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/shared/proparser/qmakeglobals.h b/src/shared/proparser/qmakeglobals.h index 25d0141d12..ecdf316c7b 100644 --- a/src/shared/proparser/qmakeglobals.h +++ b/src/shared/proparser/qmakeglobals.h @@ -87,6 +87,8 @@ public: QString pwd; QStringList precmds, preconfigs, postcmds, postconfigs; bool after; + + void flush() { after = false; } }; class QMAKE_EXPORT QMakeGlobals |