diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-23 20:34:38 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-30 10:25:47 +0000 |
commit | 7af6e9bbe6572dc7b692e5896d01e944ce63fa16 (patch) | |
tree | 0f11515091f6b6408d6feaa644258dce40e01ff9 | |
parent | 7549bbbacbdadacb283ae73ccb8b415a3dbe0c7c (diff) |
print help from all modules in top-level builds
this is rather hacky. a proper solution would auto-generate help from
the command line argument definitions, at the cost of needing to
bootstrap qmake first.
Change-Id: Iada6e25d5b31d7db0595309887f2d13295bbc1e3
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rwxr-xr-x | configure | 10 | ||||
-rw-r--r-- | configure.bat | 10 |
2 files changed, 20 insertions, 0 deletions
@@ -522,6 +522,16 @@ done if [ "$OPT_HELP" = "yes" ]; then cat $relpath/config_help.txt + if [ -n "$CFG_TOPLEVEL" ]; then + IFS=' +' + for i in $relpathMangled/qt*/config_help.txt; do + if [ x"$i" != x"$relpath/config_help.txt" ]; then + echo + cat "$i" + fi + done + fi exit 0 fi diff --git a/configure.bat b/configure.bat index a5968e2ec7..c5daabfa65 100644 --- a/configure.bat +++ b/configure.bat @@ -84,6 +84,16 @@ goto doneargs :help type %QTSRC%\config_help.txt + if %TOPLEVEL% == true ( + for /d %%p in ("%TOPQTSRC%"\qt*) do ( + if not "%%p" == "%QTSRC%" ( + if exist "%%p\config_help.txt" ( + echo. + type "%%p\config_help.txt" + ) + ) + ) + ) exit /b 1 :redo |