summaryrefslogtreecommitdiffstats
path: root/qmake/option.h
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-01-30 18:37:11 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-01 17:38:29 +0100
commit864e1ceaf628e823103ae2d28d2c983400ba38c7 (patch)
tree8b7ebc2204d9e4f658db8cf678c7c29e461264c2 /qmake/option.h
parentd011f64524c1514a4c1606fb65618d5bd8a65c68 (diff)
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>
Diffstat (limited to 'qmake/option.h')
-rw-r--r--qmake/option.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/option.h b/qmake/option.h
index 7ca0d274ff..541757b264 100644
--- a/qmake/option.h
+++ b/qmake/option.h
@@ -207,7 +207,7 @@ struct Option
};
private:
- static int parseCommandLine(QStringList &args);
+ static int parseCommandLine(QStringList &args, QMakeCmdLineParserState &state);
};
inline QString fixEnvVariables(const QString &x) { return Option::fixString(x, Option::FixEnvVars); }