From 864e1ceaf628e823103ae2d28d2c983400ba38c7 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 30 Jan 2013 18:37:11 +0100 Subject: don't flush qmake command line twice otherwise variable assignments (including -config options) from $QMAKEFLAGS are lost. Change-Id: I818e9372d2b0ff44333dc3eb8fc3420f84ab01c5 Reviewed-by: Joerg Bornemann Reviewed-by: Oswald Buddenhagen --- qmake/library/qmakeglobals.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'qmake/library/qmakeglobals.h') diff --git a/qmake/library/qmakeglobals.h b/qmake/library/qmakeglobals.h index 9f8893ec9c..efb4d28a63 100644 --- a/qmake/library/qmakeglobals.h +++ b/qmake/library/qmakeglobals.h @@ -99,6 +99,8 @@ public: QString pwd; QStringList precmds, preconfigs, postcmds, postconfigs; bool after; + + void flush() { after = false; } }; class QMAKE_EXPORT QMakeGlobals -- cgit v1.2.3