summaryrefslogtreecommitdiffstats
path: root/qmake/option.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-01-03 19:10:14 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-01-06 20:09:18 +0000
commit34cc41d8a17e6e30f01f22c5d382c28d49ae37e1 (patch)
tree1bb4b6623d8a16ae37bfb99c05b176781b733170 /qmake/option.cpp
parent52d64fca662d0e488801fc40dffdc0a732cfdbd5 (diff)
don't pass qmake configure arguments to sub-projects
the arguments after '--' are by definition meant only for the top-level project, as that's where configure is invoked from. passing them to sub-projects just adds noise to the make output and misleads users. note that this specifically does not support qmake -r, which will break if the subprojects rely on the arguments being absent. this isn't a problem, because the qt build doesn't support qmake -r anyway. Change-Id: I7ecff6212ce3137526005fc324a4a7ae45e3345e Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake/option.cpp')
-rw-r--r--qmake/option.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp
index fb49f5a100..9dcd343c8a 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -427,6 +427,7 @@ Option::init(int argc, char **argv)
//return ret == QMAKE_CMDLINE_SHOW_USAGE ? usage(argv[0]) : false;
}
globals->qmake_args = args;
+ globals->qmake_extra_args = cmdstate.extraargs;
}
globals->commitCommandLineArguments(cmdstate);
globals->debugLevel = Option::debug_level;