summaryrefslogtreecommitdiffstats
path: root/qmake/option.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-02-03 18:12:52 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-02-06 16:34:17 +0000
commit4adc1012e19f5e12ab2fb96effc9ea88d2a05eda (patch)
tree585b19485d52f94295adc64c08bed44a95a11f8d /qmake/option.cpp
parentad51c8aa0a00c1bbec7386472ca454079e284051 (diff)
add a bunch of complementary options to -after
in particular, -before (just for symmetry, as it's the default), -early (the actual objective), and -late (for symmetry again). Change-Id: I274303582a348b052c3e5106ff360ab4fd7d4ee2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake/option.cpp')
-rw-r--r--qmake/option.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 9dcd343c8a..52f9cb8a0e 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -151,17 +151,23 @@ bool usage(const char *a0)
" -Wdeprecated Turn on deprecation warnings (on by default)\n"
"\n"
"Options:\n"
- " * You can place any variable assignment in options and it will be *\n"
- " * processed as if it was in [files]. These assignments will be parsed *\n"
- " * before [files]. *\n"
+ " * You can place any variable assignment in options and it will be *\n"
+ " * processed as if it was in [files]. These assignments will be *\n"
+ " * processed before [files] by default. *\n"
" -o file Write output to file\n"
" -d Increase debug level\n"
" -t templ Overrides TEMPLATE as templ\n"
" -tp prefix Overrides TEMPLATE so that prefix is prefixed into the value\n"
" -help This help\n"
" -v Version information\n"
- " -after All variable assignments after this will be\n"
+ " -early All subsequent variable assignments will be\n"
+ " parsed right before default_pre.prf\n"
+ " -before All subsequent variable assignments will be\n"
+ " parsed right before [files] (the default)\n"
+ " -after All subsequent variable assignments will be\n"
" parsed after [files]\n"
+ " -late All subsequent variable assignments will be\n"
+ " parsed right after default_post.prf\n"
" -norecursive Don't do a recursive search\n"
" -recursive Do a recursive search\n"
" -set <prop> <value> Set persistent property\n"