diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-01-30 18:37:11 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-06 14:09:16 +0100 |
| commit | 94d5d3fd3b0fb7c8ab796b4f4137025e1a40bbef (patch) | |
| tree | b6a4ea4ac56cd50467966770695893c535c89936 | |
| parent | 9c80f8fc9f058ec5b34a7ee688a3a77fd6a0e414 (diff) | |
| download | qttools-94d5d3fd3b0fb7c8ab796b4f4137025e1a40bbef.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/linguist/shared/qmakeglobals.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/linguist/shared/qmakeglobals.h b/src/linguist/shared/qmakeglobals.h index 3a77a4c70..f69581ac2 100644 --- a/src/linguist/shared/qmakeglobals.h +++ b/src/linguist/shared/qmakeglobals.h @@ -99,6 +99,8 @@ public: QString pwd; QStringList precmds, preconfigs, postcmds, postconfigs; bool after; + + void flush() { after = false; } }; class QMAKE_EXPORT QMakeGlobals |