diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-18 16:55:20 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-18 17:28:44 +0100 |
commit | d1c10615e31acc487eae0c966e8c3a8e5927af84 (patch) | |
tree | b0612c6dd55846aa2aafbc8387848d4eed88b091 /configure | |
parent | dd69e430ca3d8be0465b43d8fd332aed5a2d0634 (diff) |
slash the -fast configure option
it's completely broken, and i have no time to fix it properly now.
configure runs no qmake -r by default any more, so it's fast enough.
Change-Id: Ib2b4c68f1fc2fe95accecbe93dd5a87c9b015692
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 59 |
1 files changed, 0 insertions, 59 deletions
@@ -861,7 +861,6 @@ PLATFORM=$QMAKESPEC QT_CROSS_COMPILE=no OPT_CONFIRM_LICENSE=no OPT_SHADOW=maybe -OPT_FAST=auto OPT_VERBOSE=no OPT_HELP= CFG_SILENT=no @@ -2015,13 +2014,6 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - fast) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - OPT_FAST="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; rpath) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_RPATH="$VAL" @@ -2305,14 +2297,6 @@ if [ ! -d "${outpath}/lib/fonts" ]; then fi fi -if [ "$OPT_FAST" = "auto" ]; then - if [ '!' -z "$AWK" ] && [ "$CFG_DEV" = "yes" ]; then - OPT_FAST=yes - else - OPT_FAST=no - fi -fi - # find a make command if [ -z "$MAKE" ]; then MAKE= @@ -3099,12 +3083,6 @@ Configure options: -fully-process ..... Generate Makefiles for the entire Qt tree. -dont-process ...... Do not generate any Makefiles. - * -no-fast ........... Configure Qt normally by generating Makefiles for all - project files. - -fast .............. Configure Qt quickly by generating Makefiles only for - library and subdirectory targets. All other Makefiles - are created as wrappers, which will in turn run qmake. - -no-largefile ...... Disables large file support. + -largefile ......... Enables Qt to access files larger than 4 GB. @@ -6375,43 +6353,6 @@ if [ "$CFG_PROCESS" != "no" ]; then else "$outpath/bin/qmake" "$relpath" fi - - if [ "$OPT_FAST" = "yes" ]; then - PART_ROOTS= - for part in $CFG_BUILD_PARTS; do - case "$part" in - examples|tests) PART_ROOTS="$PART_ROOTS $part" ;; - esac - done - if [ "x$PART_ROOTS" != "x" ]; then - echo - echo "Creating stub makefiles. Please wait..." - QMAKE="$outpath/bin/qmake" - [ "$CFG_DEBUG_RELEASE" = "no" ] && first_tgt="first_target: first" || first_tgt= - (cd "$relpath" && find $PART_ROOTS -name '*.pro') | grep -v /testdata/ | while read p; do - d=${p%/*} - test -f "$outpath/$d/Makefile" && continue - echo " for $relpath/$p" - - mkdir -p "$outpath/$d" || exit - cat > "$outpath/$d/Makefile" <<EOF || exit -# $outpath/$d/Makefile: generated by configure -# -# WARNING: This makefile will be replaced with a real makefile. -# All changes made to this file will be lost. - -QMAKE = "$QMAKE" - -$first_tgt -all clean install qmake first Makefile: FORCE - \$(QMAKE) $QMAKE_SWITCHES "$relpath/$p" - \$(MAKE) \$@ -FORCE: -EOF - done || exit - echo "Done" - fi - fi fi #------------------------------------------------------------------------------- |