summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure24
1 files changed, 1 insertions, 23 deletions
diff --git a/configure b/configure
index a6bd6c1bcb..e7ebd9f7b8 100755
--- a/configure
+++ b/configure
@@ -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