diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-06-19 11:46:10 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-07-07 18:19:59 +0200 |
commit | b7d86139772c3ce662ea7f092658699d351bbb1d (patch) | |
tree | 433c8cd4f6912d642c64987e229138cfc174ca19 /configure | |
parent | e8f2be1494111e066d8a68467452b0136865062b (diff) |
nuke -process/-fully-process/-dont-process options
[ChangeLog][configure] The -process/-fully-process/-dont-process options
have been removed due to being unnecessary and counterproductive.
-fully-process has always been broken to a degree under unix (and since
5.0 under windows) - rcc isn't built before running qmake -r, so the
dependencies are unreliable (and there are many warning messages from
qmake).
also, it is a lot slower nowadays, as qmake -r is not parallelized.
-dont-process doesn't make any sense any more - even if you don't need
the Makefile for some obscure reason, the time spent on creating it is
not relevant without the recursion.
this leaves -process as the only option.
Task-number: QTBUG-36955
Change-Id: Ifd3949d9ff773780646c6f65db1629e1c19e53d2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 24 |
1 files changed, 1 insertions, 23 deletions
@@ -722,7 +722,6 @@ CFG_SILENT=no CFG_ALSA=auto CFG_PULSEAUDIO=auto CFG_COREWLAN=auto -CFG_PROCESS=yes CFG_ICU=auto CFG_FORCE_ASSERTS=no CFG_PCRE=auto @@ -2068,15 +2067,6 @@ while [ "$#" -gt 0 ]; do silent) CFG_SILENT="$VAL" ;; - dont-process) - CFG_PROCESS=no - ;; - process) - CFG_PROCESS=partial - ;; - fully-process) - CFG_PROCESS=full - ;; audio-backend) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_AUDIO_BACKEND="$VAL" @@ -2275,10 +2265,6 @@ Configure options: * -shared ............ Create and use shared Qt libraries. -static ............ Create and use static Qt libraries. - * -process ........... Generate only a top-level Makefile. - -fully-process ..... Generate Makefiles for the entire Qt tree. - -dont-process ...... Do not generate any Makefiles. - -no-largefile ...... Disables large file support. + -largefile ......... Enables Qt to access files larger than 4 GB. @@ -6647,7 +6633,6 @@ rm -f "$QMAKE_VARS_FILE" 2>/dev/null # build makefiles based on the configuration #------------------------------------------------------------------------------- -if [ "$CFG_PROCESS" != "no" ]; then ( # fork to make the cd stay local relpathMangled=$relpath @@ -6656,16 +6641,9 @@ if [ "$CFG_PROCESS" != "no" ]; then cd .. fi - if [ "$CFG_PROCESS" = "full" ]; then - echo "Creating makefiles. Please wait..." - "$outpath/bin/qmake" -r "$relpathMangled" - echo "Done" - else - "$outpath/bin/qmake" "$relpathMangled" - fi + "$outpath/bin/qmake" "$relpathMangled" ) -fi #------------------------------------------------------------------------------- # check for platforms that we don't yet know about |