summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure754
1 files changed, 129 insertions, 625 deletions
diff --git a/configure b/configure
index c057351e96..5e78360fa6 100755
--- a/configure
+++ b/configure
@@ -2,8 +2,7 @@
#############################################################################
##
## Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-## All rights reserved.
-## Contact: Nokia Corporation (qt-info@nokia.com)
+## Contact: http://www.qt-project.org/
##
## This file is the build configuration utility of the Qt Toolkit.
##
@@ -36,6 +35,7 @@
##
##
##
+##
## $QT_END_LICENSE$
##
#############################################################################
@@ -191,6 +191,7 @@ BUILD_ON_MAC=no
PLATFORM_MAC=no
if [ -d /System/Library/Frameworks/Carbon.framework ]; then
BUILD_ON_MAC=yes
+ PLATFORM_MAC=maybe
fi
#-----------------------------------------------------------------------------
@@ -641,9 +642,6 @@ CFG_CONFIGURE_EXIT_ON_ERROR=yes
CFG_PROFILE=no
CFG_EXCEPTIONS=unspecified
CFG_GUI=auto # (yes|no|auto)
-CFG_SCRIPT=auto # (yes|no|auto)
-CFG_SCRIPTTOOLS=auto # (yes|no|auto)
-CFG_XMLPATTERNS=auto # (yes|no|auto)
CFG_INCREMENTAL=auto
CFG_QCONFIG=full
CFG_DEBUG=auto
@@ -659,14 +657,10 @@ CFG_XFIXES=runtime
CFG_ZLIB=auto
CFG_SQLITE=qt
CFG_GIF=auto
-CFG_TIFF=auto
-CFG_LIBTIFF=auto
CFG_PNG=yes
CFG_LIBPNG=auto
CFG_JPEG=auto
CFG_LIBJPEG=auto
-CFG_MNG=auto
-CFG_LIBMNG=auto
CFG_XCURSOR=runtime
CFG_XRANDR=runtime
CFG_XRENDER=auto
@@ -687,18 +681,10 @@ QT_DEFAULT_BUILD_PARTS="libs examples tests"
CFG_BUILD_PARTS=""
CFG_NOBUILD_PARTS=""
CFG_RELEASE_QMAKE=no
-CFG_PHONON=auto
-CFG_PHONON_BACKEND=yes
-CFG_MULTIMEDIA=auto
CFG_AUDIO_BACKEND=auto
-CFG_SVG=auto
-CFG_V8=auto
CFG_V8SNAPSHOT=auto
-CFG_DECLARATIVE=auto
CFG_DECLARATIVE_DEBUG=yes
-CFG_WEBKIT=auto # (yes|no|auto|debug)
CFG_JAVASCRIPTCORE_JIT=auto
-CFG_LOCATION=auto
CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen directfb"
CFG_GFX_ON="linuxfb multiscreen"
@@ -815,6 +801,7 @@ CFG_COREWLAN=auto
CFG_NOPROCESS=no
CFG_ICU=auto
CFG_FORCE_ASSERTS=no
+CFG_PCRE=auto
# initalize variables used for installation
QT_INSTALL_PREFIX=
@@ -947,17 +934,10 @@ if [ "$CFG_EMBEDDED" = "nacl" ]; then
L_FLAGS="$L_FLAGS -I${CFG_NACL_PATH}/toolchain/mac_x86/sdk/nacl-sdk/lib"
fi
- echo "-no-multimedia -no-webkit -no-phonon -no-nultimedia -no-mediaservices -no-xmlpatterns -no-script -no-sql-sqlite -nomake tests"
- CFG_MULTIMEDIA=no
- CFG_WEBKIT=no
- CFG_PHONON=no
- CFG_MULTIMEDIA=no
+ echo "-no-mediaservices -no-sql-sqlite -nomake tests"
CFG_MEDIASERVICES=no
- CFG_XMLPATTERNS=no
- CFG_SCRIPT=no
CFG_SQLITE=no
CFG_SQL_sqlite=no
- CFG_LIBTIFF=no
CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS tests"
QT_CONFIG="$QT_CONFIG nacl"
fi
@@ -997,26 +977,13 @@ while [ "$#" -gt 0 ]; do
VAR=`echo $1 | sed "s,^-[^-]*-\(.*\),\1,"`
VAL=`echo $1 | sed "s,^-\([^-]*\).*,\1,"`
;;
- #WebKit options
- -webkit)
- VAR="webkit"
- VAL="yes"
- ;;
- -webkit-debug)
- VAR="webkit"
- VAL="debug"
- ;;
- -no-webkit)
- VAR="webkit"
- VAL="no"
- ;;
#Qt style no options
-no-*)
VAR=`echo $1 | sed "s,^-no-\(.*\),\1,"`
VAL=no
;;
#Qt style yes options
- -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-wayland|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-debug-and-release|-exceptions|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-v8|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-icu|-force-asserts|-testcocoon)
+ -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-wayland|-nis|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-debug-and-release|-exceptions|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-phonon-backend|-audio-backend|-declarative-debug|-javascript-jit|-rpath|-force-pkg-config|-icu|-force-asserts|-testcocoon)
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
VAL=yes
;;
@@ -1806,22 +1773,6 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
- libmng)
- [ "$VAL" = "yes" ] && VAL=qt
- if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
- CFG_LIBMNG="$VAL"
- else
- UNKNOWN_OPT=yes
- fi
- ;;
- libtiff)
- [ "$VAL" = "yes" ] && VAL=qt
- if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
- CFG_LIBTIFF="$VAL"
- else
- UNKNOWN_OPT=yes
- fi
- ;;
nas-sound)
if [ "$VAL" = "system" ] || [ "$VAL" = "no" ]; then
CFG_NAS="$VAL"
@@ -1938,7 +1889,7 @@ while [ "$#" -gt 0 ]; do
fi
fi
;;
- qdbus|dbus)
+ dbus)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "linked" ]; then
CFG_DBUS="$VAL"
elif [ "$VAL" = "runtime" ]; then
@@ -1982,72 +1933,6 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
- xmlpatterns)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
- CFG_XMLPATTERNS="yes"
- else
- if [ "$VAL" = "no" ]; then
- CFG_XMLPATTERNS="no"
- else
- UNKNOWN_OPT=yes
- fi
- fi
- ;;
- script)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
- CFG_SCRIPT="yes"
- else
- if [ "$VAL" = "no" ]; then
- CFG_SCRIPT="no"
- else
- UNKNOWN_OPT=yes
- fi
- fi
- ;;
- scripttools)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
- CFG_SCRIPTTOOLS="yes"
- else
- if [ "$VAL" = "no" ]; then
- CFG_SCRIPTTOOLS="no"
- else
- UNKNOWN_OPT=yes
- fi
- fi
- ;;
- svg)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
- CFG_SVG="yes"
- else
- if [ "$VAL" = "no" ]; then
- CFG_SVG="no"
- else
- UNKNOWN_OPT=yes
- fi
- fi
- ;;
- v8)
- if [ "$VAL" = "yes" ]; then
- CFG_V8="yes"
- else
- if [ "$VAL" = "no" ]; then
- CFG_V8="no"
- else
- UNKNOWN_OPT=yes
- fi
- fi
- ;;
- declarative)
- if [ "$VAL" = "yes" ]; then
- CFG_DECLARATIVE="yes"
- else
- if [ "$VAL" = "no" ]; then
- CFG_DECLARATIVE="no"
- else
- UNKNOWN_OPT=yes
- fi
- fi
- ;;
declarative-debug)
if [ "$VAL" = "yes" ]; then
CFG_DECLARATIVE_DEBUG="yes"
@@ -2059,21 +1944,6 @@ while [ "$#" -gt 0 ]; do
fi
fi
;;
- webkit)
- [ "$VAL" = "auto" ] && VAL="yes"
- CFG_WEBKIT="$VAL"
- ;;
- location)
- if [ "$VAL" = "yes" ]; then
- CFG_LOCATION="yes"
- else
- if [ "$VAL" = "no" ]; then
- CFG_LOCATION="no"
- else
- UNKNOWN_OPT=yes
- fi
- fi
- ;;
javascript-jit)
if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ] || [ "$VAL" = "no" ]; then
CFG_JAVASCRIPTCORE_JIT="$VAL"
@@ -2278,13 +2148,6 @@ while [ "$#" -gt 0 ]; do
silent)
CFG_SILENT="$VAL"
;;
- phonon)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
- CFG_PHONON="$VAL"
- else
- UNKNOWN_OPT=yes
- fi
- ;;
phonon-backend)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_PHONON_BACKEND="$VAL"
@@ -2292,13 +2155,6 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
- multimedia)
- if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
- CFG_MULTIMEDIA="$VAL"
- else
- UNKNOWN_OPT=yes
- fi
- ;;
dont-process)
CFG_NOPROCESS=yes
;;
@@ -2326,6 +2182,13 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
+ pcre)
+ if [ "$VAL" = "qt" ] || [ "$VAL" = "system" ]; then
+ CFG_PCRE="$VAL"
+ else
+ UNKNOWN_OPT=yes
+ fi
+ ;;
*)
UNKNOWN_OPT=yes
;;
@@ -2460,7 +2323,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then
if [ -x "$relpath/bin/syncqt" ]; then
mkdir -p "$outpath/bin"
echo "#!/bin/sh" >"$outpath/bin/syncqt"
- echo "perl \"$relpath/bin/syncqt\" -outdir \"$outpath\" \"$relpath\" \"\$@\"" >>"$outpath/bin/syncqt"
+ echo "perl \"$relpath/bin/syncqt\" -qtdir \"$outpath\" \"\$@\"" >>"$outpath/bin/syncqt"
chmod 755 "$outpath/bin/syncqt"
fi
@@ -2499,11 +2362,6 @@ if [ "$OPT_SHADOW" = "yes" ]; then
# symlink the doc directory
rm -rf "$outpath/doc"
ln -s "$relpath/doc" "$outpath/doc"
-
- # make sure q3porting.xml can be found
- mkdir -p "$outpath/tools/porting/src"
- rm -f "$outpath/tools/porting/src/q3porting.xml"
- ln -s "$relpath/tools/porting/src/q3porting.xml" "$outpath/tools/porting/src"
fi
# symlink fonts to be able to run application from build directory
@@ -2630,8 +2488,21 @@ if [ -z "$PLATFORM" ]; then
case "$UNAME_SYSTEM:$UNAME_RELEASE" in
Darwin:*)
if [ "$PLATFORM_MAC" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then
- PLATFORM=macx-g++
- # PLATFORM=macx-xcode
+ OSX_VERSION=`uname -r | cut -d. -f1`
+ if [ "$OSX_VERSION" -ge 11 ]; then
+ # We're on Lion or above. Check if we have a supported Clang version
+ case "$(clang -v 2>&1 | grep -Po '(?<=version )\d[\d.]+')" in
+ 3.*)
+ PLATFORM=macx-clang
+ PLATFORM_NOTES="\n - Also available for Mac OS X: macx-g++\n"
+ ;;
+ *)
+ PLATFORM=macx-g++
+ ;;
+ esac
+ else
+ PLATFORM=macx-g++
+ fi
else
PLATFORM=darwin-g++
fi
@@ -2951,21 +2822,6 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
esac
esac
;;
- Darwin:*:*)
- case "$UNAME_MACHINE" in
- Power?Macintosh)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " 32-bit Apple PowerPC (powerpc)"
- fi
- ;;
- x86)
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " 32-bit Intel 80x86 (i386)"
- fi
- ;;
- esac
- CFG_HOST_ARCH=macosx
- ;;
AIX:*:00????????00)
if [ "$OPT_VERBOSE" = "yes" ]; then
echo " 64-bit IBM PowerPC (powerpc)"
@@ -3093,29 +2949,6 @@ arm*)
;;
esac
-if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " '$CFG_ARCH' is supported"
- fi
-else
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " '$CFG_ARCH' is unsupported, using 'generic'"
- fi
- CFG_ARCH=generic
-fi
-if [ "$CFG_HOST_ARCH" != "$CFG_ARCH" ]; then
- if [ -d "$relpath/src/corelib/arch/$CFG_HOST_ARCH" ]; then
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " '$CFG_HOST_ARCH' is supported"
- fi
- else
- if [ "$OPT_VERBOSE" = "yes" ]; then
- echo " '$CFG_HOST_ARCH' is unsupported, using 'generic'"
- fi
- CFG_HOST_ARCH=generic
- fi
-fi
-
if [ "$OPT_VERBOSE" = "yes" ]; then
echo "System architecture: '$CFG_ARCH'"
if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then
@@ -3129,7 +2962,7 @@ fi
# detect build style
if [ "$CFG_DEBUG" = "auto" ]; then
- if [ "$CFG_ARCH" = "macosx" -o "$XPLATFORM_MINGW" = "yes" ]; then
+ if [ "$PLATFORM_MAC" = "yes" -o "$XPLATFORM_MINGW" = "yes" ]; then
CFG_DEBUG_RELEASE=yes
CFG_DEBUG=yes
elif [ "$CFG_DEV" = "yes" ]; then
@@ -3194,7 +3027,7 @@ if [ '!' -z "$CFG_SDK" ]; then
fi
# find the default framework value
-if [ "$CFG_ARCH" = "macosx" ]; then
+if [ "$PLATFORM_MAC" = "yes" ]; then
if [ "$CFG_FRAMEWORK" = "auto" ]; then
CFG_FRAMEWORK="$CFG_SHARED"
elif [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_SHARED" = "no" ]; then
@@ -3316,7 +3149,7 @@ if [ "$PLATFORM_MAC" = "yes" ]; then
fi
# find the default framework value
-if [ "$CFG_ARCH" = "macosx" ]; then
+if [ "$PLATFORM_MAC" = "yes" ]; then
if [ "$CFG_FRAMEWORK" = "auto" ]; then
CFG_FRAMEWORK="$CFG_SHARED"
elif [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_SHARED" = "no" ]; then
@@ -3565,24 +3398,21 @@ Usage: $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir
[-accessibility] [-no-stl] [-stl] [-no-sql-<driver>] [-sql-<driver>]
[-plugin-sql-<driver>] [-system-sqlite]
[-platform] [-D <string>] [-I <string>] [-L <string>] [-help]
- [-qt-zlib] [-system-zlib] [-no-gif] [-no-libtiff] [-qt-libtiff] [-system-libtiff]
- [-no-libpng] [-qt-libpng] [-system-libpng] [-no-libmng] [-qt-libmng]
- [-system-libmng] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg] [-make <part>]
+ [-qt-zlib] [-system-zlib] [-no-gif] [-no-libpng] [-qt-libpng] [-system-libpng]
+ [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg] [-make <part>]
[-nomake <part>] [-R <string>] [-l <string>] [-no-rpath] [-rpath] [-continue]
[-verbose] [-v] [-silent] [-no-nis] [-nis] [-no-cups] [-cups] [-no-iconv]
[-iconv] [-no-pch] [-pch] [-no-dbus] [-dbus] [-dbus-linked] [-no-gui]
[-no-separate-debug-info] [-no-mmx] [-no-3dnow] [-no-sse] [-no-sse2]
[-no-sse3] [-no-ssse3] [-no-sse4.1] [-no-sse4.2] [-no-avx] [-no-neon]
[-qtnamespace <namespace>] [-qtlibinfix <infix>] [-separate-debug-info] [-armfpa]
- [-no-optimized-qmake] [-optimized-qmake] [-no-xmlpatterns] [-xmlpatterns]
- [-no-multimedia] [-multimedia] [-no-phonon] [-phonon] [-no-phonon-backend] [-phonon-backend]
- [-no-media-backend] [-media-backend] [-no-audio-backend] [-audio-backend]
+ [-no-phonon-backend] [-phonon-backend] [-no-media-backend] [-media-backend]
+ [-no-audio-backend] [-audio-backend]
+ [-no-javascript-jit] [-javascript-jit] [-no-declarative-debug] [-declarative-debug]
+ [-no-optimized-qmake] [-optimized-qmake]
[-no-openssl] [-openssl] [-openssl-linked]
- [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit] [-webkit-debug]
- [-no-javascript-jit] [-javascript-jit]
- [-no-script] [-script] [-no-scripttools] [-scripttools]
- [-no-declarative] [-declarative] [-no-declarative-debug] [-declarative-debug]
- [-no-location] [-location]
+ [-no-gtkstyle] [-gtkstyle]
+ [-qt-pcre] [-system-pcre]
[additional platform specific options (see below)]
@@ -3705,52 +3535,15 @@ fi
-system-sqlite ..... Use sqlite from the operating system.
- -no-xmlpatterns .... Do not build the QtXmlPatterns module.
- + -xmlpatterns ....... Build the QtXmlPatterns module.
- QtXmlPatterns is built if a decent C++ compiler
- is used and exceptions are enabled.
-
- -no-multimedia ..... Do not build the QtMultimedia module.
- + -multimedia ........ Build the QtMultimedia module.
-
- -no-audio-backend .. Do not build the platform audio backend into QtMultimedia.
- + -audio-backend ..... Build the platform audio backend into QtMultimedia if available.
-
- -no-phonon ......... Do not build the Phonon module.
- + -phonon ............ Build the Phonon module.
- Phonon is built if a decent C++ compiler is used.
-no-phonon-backend.. Do not build the platform phonon plugin.
+ -phonon-backend..... Build the platform phonon plugin.
- -no-svg ............ Do not build the SVG module.
- + -svg ............... Build the SVG module.
-
- -no-webkit ......... Do not build the WebKit module.
- + -webkit ............ Build the WebKit module.
- WebKit is built if a decent C++ compiler is used.
- -webkit-debug ...... Build the WebKit module with debug symbols.
-
-no-javascript-jit . Do not build the JavaScriptCore JIT compiler.
+ -javascript-jit .... Build the JavaScriptCore JIT compiler.
- -no-script ......... Do not build the QtScript module.
- + -script ............ Build the QtScript module.
-
- -no-scripttools .... Do not build the QtScriptTools module.
- + -scripttools ....... Build the QtScriptTools module.
-
- -no-v8 ............. Do not build the V8 module.
- + -v8 ................ Build the V8 module.
-
- -no-declarative ..... Do not build the declarative module.
- + -declarative ....... Build the declarative module.
-
-no-declarative-debug ..... Do not build the declarative debugging support.
+ -declarative-debug ....... Build the declarative debugging support.
- -no-location ....... Do not build the QtLocation module.
- + -location .......... Build the QtLocation module.
-
-platform target ... The operating system and compiler you are building
on ($PLATFORM).
@@ -3800,21 +3593,11 @@ Third Party Libraries:
-no-gif ............ Do not compile GIF reading support.
- -no-libtiff ........ Do not compile TIFF support.
- -qt-libtiff ........ Use the libtiff bundled with Qt.
- + -system-libtiff .... Use libtiff from the operating system.
- See http://www.libtiff.org
-
-no-libpng ......... Do not compile PNG support.
-qt-libpng ......... Use the libpng bundled with Qt.
+ -system-libpng ..... Use libpng from the operating system.
See http://www.libpng.org/pub/png
- -no-libmng ......... Do not compile MNG support.
- -qt-libmng ......... Use the libmng bundled with Qt.
- + -system-libmng ..... Use libmng from the operating system.
- See http://www.libmng.com
-
-no-libjpeg ........ Do not compile JPEG support.
-qt-libjpeg ........ Use the libjpeg bundled with Qt.
+ -system-libjpeg .... Use libjpeg from the operating system.
@@ -3824,6 +3607,9 @@ Third Party Libraries:
+ -openssl ........... Enable run-time OpenSSL support.
-openssl-linked .... Enabled linked OpenSSL support.
+ -qt-pcre ........... Use the PCRE library bundled with Qt.
+ + -system-pcre ....... Use the PCRE library from the operating system.
+
Additional options:
-make <part> ....... Add part to the list of parts to be built at make time.
@@ -4589,7 +4375,7 @@ if [ -n "$PERL" ] && [ -x "$relpath/bin/syncqt" ]; then
SYNCQT_OPTS=
[ "$CFG_DEV" = "yes" ] && SYNCQT_OPTS="$SYNCQT_OPTS -check-includes"
if [ "$OPT_SHADOW" = "yes" ]; then
- "$outpath/bin/syncqt" $SYNCQT_OPTS || exit 1
+ "$outpath/bin/syncqt" $SYNCQT_OPTS "$relpath" || exit 1
elif [ "$CFG_DEV" = "yes" ] || [ ! -d $relpath/include ] || [ -d $relpath/.git ]; then
QTDIR="$relpath" perl "$outpath/bin/syncqt" $SYNCQT_OPTS || exit 1
fi
@@ -4947,41 +4733,6 @@ if [ "$CFG_GIF" = "auto" ]; then
fi
fi
-# detect how tiff should be built
-if [ "$CFG_TIFF" = "auto" ]; then
- if [ "$CFG_SHARED" = "yes" ]; then
- CFG_TIFF=plugin
- else
- CFG_TIFF=yes
- fi
-fi
-
-# detect tiff
-if [ "$CFG_LIBTIFF" = "auto" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libtiff "libtiff" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
- CFG_LIBTIFF=system
- else
- CFG_LIBTIFF=qt
- fi
-fi
-
-# detect how mng should be built
-if [ "$CFG_MNG" = "auto" ]; then
- if [ "$CFG_SHARED" = "yes" ]; then
- CFG_MNG=plugin
- else
- CFG_MNG=yes
- fi
-fi
-# detect mng
-if [ "$CFG_LIBMNG" = "auto" ]; then
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libmng "libmng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
- CFG_LIBMNG=system
- else
- CFG_LIBMNG=qt
- fi
-fi
-
# detect png
if [ "$CFG_LIBPNG" = "auto" ]; then
if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
@@ -5282,8 +5033,8 @@ fi
# auto-detect iconv(3) support
if [ "$CFG_ICONV" != "no" ]; then
- if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then
- CFG_ICONV=no
+ if [ "$PLATFORM_QWS" = "yes" -o "$XPLATFORM_MINGW" = "yes" ] || [ "$PLATFORM_QPA" = "yes" -a "$CFG_ICONV" = "auto" ]; then
+ CFG_ICONV=no
elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
CFG_ICONV=yes
elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/sun-libiconv" "SUN libiconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
@@ -5328,15 +5079,6 @@ if [ "$CFG_DBUS" != "no" ]; then
fi
fi
-if [ "$CFG_MULTIMEDIA" = "auto" ]; then
- CFG_MULTIMEDIA="$CFG_GUI"
-fi
-
-if [ "$CFG_MULTIMEDIA" = "yes" ] && [ "$CFG_GUI" = "no" ]; then
- echo "QtMultimedia requested, but it can't be built without QtGui"
- exit 1
-fi
-
# X11/QWS/Lighthouse
if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then
@@ -5363,66 +5105,31 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "ye
fi
fi
- if [ "$CFG_GUI" = "no" ]; then
- if [ "$CFG_PHONON" = "auto" ]; then
- CFG_PHONON=no
- fi
- if [ "$CFG_PHONON" != "no" ]; then
- echo "Phonon enabled, but GUI disabled."
- echo " You might need to either enable the GUI or disable Phonon"
- exit 1
+ # ### Vestige
+ if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then
+ if [ -n "$PKG_CONFIG" ]; then
+ QT_CFLAGS_GSTREAMER=`$PKG_CONFIG --cflags gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null`
+ QT_LIBS_GSTREAMER=`$PKG_CONFIG --libs gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null`
fi
- fi
-
- # Auto-detect GStreamer support (needed for Phonon)
- if [ "$CFG_PHONON" != "no" ]; then
- if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then
- if [ -n "$PKG_CONFIG" ]; then
- QT_CFLAGS_GSTREAMER=`$PKG_CONFIG --cflags gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null`
- QT_LIBS_GSTREAMER=`$PKG_CONFIG --libs gstreamer-0.10 gstreamer-plugins-base-0.10 2>/dev/null`
- fi
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/gstreamer "GStreamer" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GSTREAMER $QT_LIBS_GSTREAMER $X11TESTS_FLAGS; then
- CFG_GSTREAMER=yes
- QMakeVar set QT_CFLAGS_GSTREAMER "$QT_CFLAGS_GSTREAMER"
- QMakeVar set QT_LIBS_GSTREAMER "$QT_LIBS_GSTREAMER"
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/gstreamer "GStreamer" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_GSTREAMER $QT_LIBS_GSTREAMER $X11TESTS_FLAGS; then
+ CFG_GSTREAMER=yes
+ QMakeVar set QT_CFLAGS_GSTREAMER "$QT_CFLAGS_GSTREAMER"
+ QMakeVar set QT_LIBS_GSTREAMER "$QT_LIBS_GSTREAMER"
+ else
+ if [ "$CFG_GSTREAMER" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+ echo "Gstreamer support cannot be enabled due to functionality tests!"
+ echo " Turn on verbose messaging (-v) to $0 to see the final report."
+ echo " If you believe this message is in error you may use the continue"
+ echo " switch (-continue) to $0 to continue."
+ exit 101
else
- if [ "$CFG_GSTREAMER" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
- echo "Gstreamer support cannot be enabled due to functionality tests!"
- echo " Turn on verbose messaging (-v) to $0 to see the final report."
- echo " If you believe this message is in error you may use the continue"
- echo " switch (-continue) to $0 to continue."
- exit 101
- else
- CFG_GSTREAMER=no
- fi
+ CFG_GSTREAMER=no
fi
- elif [ "$CFG_GLIB" = "no" ]; then
- CFG_GSTREAMER=no
fi
- else
+ elif [ "$CFG_GLIB" = "no" ]; then
CFG_GSTREAMER=no
fi
- if [ "$CFG_PHONON" != "no" ]; then
- if [ "$CFG_PHONON_BACKEND" != "no" ]; then
- if [ "$CFG_GSTREAMER" = "yes" ]; then
- CFG_PHONON=yes
- else
- if [ "$CFG_PHONON" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
- echo "Phonon support cannot be enabled due to functionality tests!"
- echo " Turn on verbose messaging (-v) to $0 to see the final report."
- echo " If you believe this message is in error you may use the continue"
- echo " switch (-continue) to $0 to continue."
- exit 101
- else
- CFG_PHONON=no
- fi
- fi
- else
- CFG_PHONON=yes
- fi
- fi
-
# auto-detect libicu support
if [ "$CFG_ICU" != "no" ]; then
if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/icu "ICU" $L_FLAGS $I_FLAGS $l_FLAGS; then
@@ -5643,12 +5350,6 @@ if [ "$PLATFORM_X11" = "yes" ]; then
fi
fi
- # Additional check to decide if WebKit support will be included
- if [ "$CFG_XRENDER" = "no" ] && [ "$CFG_WEBKIT" != "no" ]; then
- echo "Warning: -no-xrender will disable the QtWebkit module."
- CFG_WEBKIT="no"
- fi
-
# auto-detect MIT-SHM support
if [ "$CFG_MITSHM" != "no" ]; then
if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/mitshm "mitshm" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
@@ -5860,7 +5561,7 @@ fi
if [ "$PLATFORM_QPA" = "yes" ]; then
# auto-detect OpenGL support (es2 = OpenGL ES 2.x)
- if [ "$CFG_ARCH" = "macosx" ]; then
+ if [ "$PLATFORM_MAC" = "yes" ]; then
CFG_OPENGL=desktop
elif [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengldesktop "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then
@@ -6058,7 +5759,7 @@ if [ "$PLATFORM_QPA" = "yes" ]; then
QMakeVar add DEFINES QT_NO_CORESERVICES
fi
- if [ "$PLATFORM_QPA" = "yes" ] && [ "$BUILD_ON_MAC" = "no" ]; then
+ if [ "$PLATFORM_QPA" = "yes" ] && [ "$BUILD_ON_MAC" = "no" ] && [ "$XPLATFORM_MINGW" = "no" ]; then
if [ "$CFG_XCB" = "no" ] && [ "$CFG_WAYLAND" = "no" ]; then
if [ "$ORIG_CFG_XCB" = "auto" ] || [ "$ORIG_CFG_WAYLAND" = "auto" ]; then
echo "No QPA platform plugin enabled!"
@@ -6456,6 +6157,23 @@ if [ "$CFG_OPENSSL" != "no" ]; then
fi
fi
+# detect PCRE
+if [ "$CFG_PCRE" != "qt" ]; then
+ if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/pcre "PCRE" $L_FLAGS $I_FLAGS $l_FLAGS; then
+ CFG_PCRE=system
+ else
+ if [ "$CFG_PCRE" = "system" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
+ echo "PCRE support cannot be enabled due to functionality tests!"
+ echo " Turn on verbose messaging (-v) to $0 to see the final report."
+ echo " If you believe this message is in error you may use the continue"
+ echo " switch (-continue) to $0 to continue."
+ exit 101
+ else
+ CFG_PCRE=qt
+ fi
+ fi
+fi
+
# detect OpenVG support
if [ "$CFG_OPENVG" != "no" ]; then
if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/openvg" "OpenVG" $L_FLAGS $I_FLAGS $l_FLAGS $CONFIG_ARG; then
@@ -6581,20 +6299,15 @@ if [ "$CFG_MAC_DWARF2" = "yes" ]; then
fi
# Set the default arch if there are no "-arch" arguments on the configure line
-if [ "$CFG_ARCH" = "macosx" ] && [ "$CFG_MAC_ARCHS" = "" ]; then
+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_ARCHS" = "" ]; then
source "$mactests/defaultarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests"
CFG_MAC_ARCHS=" $QT_MAC_DEFAULT_ARCH"
[ "$OPT_VERBOSE" = "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS."
fi
-# enable Phonon
-if [ "$CFG_PHONON" = "yes" ]; then
- # No longer needed after modularization
- #QT_CONFIG="$QT_CONFIG phonon"
- if [ "$CFG_PHONON_BACKEND" = "yes" ]; then
- QT_CONFIG="$QT_CONFIG phonon-backend"
- fi
-else
- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PHONON"
+
+# ### Vestige
+if [ "$CFG_PHONON_BACKEND" = "yes" ]; then
+ QT_CONFIG="$QT_CONFIG phonon-backend"
fi
# disable accessibility
@@ -6733,7 +6446,7 @@ fi
[ "$CFG_AVX" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG avx"
[ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt"
[ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon"
-[ "$CFG_ARCH" = "macosx" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
+[ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
if [ "$CFG_CLOCK_GETTIME" = "yes" ]; then
QT_CONFIG="$QT_CONFIG clock-gettime"
fi
@@ -6765,16 +6478,6 @@ if [ "$CFG_JPEG" = "no" ]; then
elif [ "$CFG_JPEG" = "yes" ]; then
QT_CONFIG="$QT_CONFIG jpeg"
fi
-if [ "$CFG_LIBMNG" = "no" ]; then
- CFG_MNG="no"
-elif [ "$CFG_LIBMNG" = "system" ]; then
- QT_CONFIG="$QT_CONFIG system-mng"
-fi
-if [ "$CFG_MNG" = "no" ]; then
- QT_CONFIG="$QT_CONFIG no-mng"
-elif [ "$CFG_MNG" = "yes" ]; then
- QT_CONFIG="$QT_CONFIG mng"
-fi
if [ "$CFG_LIBPNG" = "no" ]; then
CFG_PNG="no"
fi
@@ -6791,16 +6494,6 @@ if [ "$CFG_GIF" = "no" ]; then
elif [ "$CFG_GIF" = "yes" ]; then
QT_CONFIG="$QT_CONFIG gif"
fi
-if [ "$CFG_LIBTIFF" = "no" ]; then
- CFG_TIFF="no"
-elif [ "$CFG_LIBTIFF" = "system" ]; then
- QT_CONFIG="$QT_CONFIG system-tiff"
-fi
-if [ "$CFG_TIFF" = "no" ]; then
- QT_CONFIG="$QT_CONFIG no-tiff"
-elif [ "$CFG_TIFF" = "yes" ]; then
- QT_CONFIG="$QT_CONFIG tiff"
-fi
if [ "$CFG_LIBFREETYPE" = "no" ]; then
QT_CONFIG="$QT_CONFIG no-freetype"
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_FREETYPE"
@@ -6906,7 +6599,7 @@ fi
[ '!' -z "$L_FLAGS" ] && QMakeVar add QMAKE_LIBDIR_FLAGS "$L_FLAGS"
[ '!' -z "$l_FLAGS" ] && QMakeVar add LIBS "$l_FLAGS"
-if [ "$CFG_ARCH" = "macosx" ]; then
+if [ "$PLATFORM_MAC" = "yes" ]; then
if [ "$CFG_RPATH" = "yes" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG absolute_library_soname"
fi
@@ -6987,6 +6680,10 @@ if [ "$CFG_FORCE_ASSERTS" = "yes" ]; then
QT_CONFIG="$QT_CONFIG force_asserts"
fi
+if [ "$CFG_PCRE" = "qt" ]; then
+ QMAKE_CONFIG="$QMAKE_CONFIG pcre"
+fi
+
#
# Some Qt modules are too advanced in C++ for some old compilers
# Detect here the platforms where they are known to work.
@@ -6994,18 +6691,9 @@ fi
# See Qt documentation for more information on which features are
# supported and on which compilers.
#
-canBuildQtXmlPatterns="yes"
-canBuildWebKit="$HAVE_STL"
canBuildQtConcurrent="yes"
-canBuildV8="yes"
canUseV8Snapshot="yes"
-# WebKit requires stdint.h
-"$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stdint "Stdint" $L_FLAGS $I_FLAGS $l_FLAGS
-if [ $? != "0" ]; then
- canBuildWebKit="no"
-fi
-
case "$XPLATFORM" in
hpux-g++*)
# PA-RISC's assembly is too limited
@@ -7129,172 +6817,46 @@ else
QT_CONFIG="$QT_CONFIG concurrent"
fi
-if [ "$CFG_XMLPATTERNS" = "yes" -a "$CFG_EXCEPTIONS" = "no" ]; then
- echo "QtXmlPatterns was requested, but it can't be built due to exceptions being disabled."
- exit 1
-fi
-if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then
- CFG_XMLPATTERNS="$canBuildQtXmlPatterns"
-elif [ "$CFG_EXCEPTIONS" = "no" ]; then
- CFG_XMLPATTERNS="no"
-fi
-# No longer needed after modularization
-#if [ "$CFG_XMLPATTERNS" = "yes" ]; then
-# QT_CONFIG="$QT_CONFIG xmlpatterns"
-#else
-# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XMLPATTERNS"
-#fi
-
-# No longer needed after modularization
-#if [ "$CFG_MULTIMEDIA" = "no" ]; then
-# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MULTIMEDIA"
-#else
-# QT_CONFIG="$QT_CONFIG multimedia"
-#fi
-
+# ### Vestige
if [ "$CFG_AUDIO_BACKEND" = "yes" ]; then
QT_CONFIG="$QT_CONFIG audio-backend"
fi
-if [ "$CFG_SVG" = "auto" ]; then
- CFG_SVG=$CFG_GUI
+# ### Vestige
+if [ "$CFG_WEBKIT" = "debug" ]; then
+ QMAKE_CONFIG="$QMAKE_CONFIG webkit-debug"
fi
-if [ "$CFG_SVG" = "yes" ] && [ "$CFG_GUI" = "no" ]; then
- echo "QtSvg requested, but it can't be built without QtGui"
- exit 1
-fi
-
-if [ "$CFG_SVG" = "yes" ]; then
- QT_CONFIG="$QT_CONFIG svg"
+# ### Vestige
+QT_CONFIG="$QT_CONFIG v8"
+# Detect snapshot support
+if [ "$CFG_ARCH" != "$CFG_HOST_ARCH" ]; then
+ case "$CFG_HOST_ARCH,$CFG_ARCH" in
+ i386,arm)
+ ;;
+ *) canUseV8Snapshot="no"
+ ;;
+ esac
else
- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SVG"
-fi
-
-if [ "$CFG_WEBKIT" != "no" ]; then
- CFG_WEBKIT="$canBuildWebKit"
-fi
-
-if [ "$CFG_WEBKIT" != "no" ]; then
- # No longer needed after modularization
- #QT_CONFIG="$QT_CONFIG webkit"
- # The reason we set CFG_WEBKIT, is such that the printed overview of what will be enabled, shows correctly.
- if [ "$CFG_WEBKIT" = "debug" ]; then
- QMAKE_CONFIG="$QMAKE_CONFIG webkit-debug"
+ if [ -n "$_SBOX_DIR" -a "$CFG_ARCH" = "arm" ]; then
+ # QEMU crashes when building inside Scratchbox with an ARM target
+ canUseV8Snapshot="no"
fi
fi
-
-if [ "$CFG_SCRIPT" = "auto" ]; then
- CFG_SCRIPT="yes"
-fi
-
-# No longer needed after modularization
-#if [ "$CFG_SCRIPT" = "yes" ]; then
-# QT_CONFIG="$QT_CONFIG script"
-#else
-# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPT"
-#fi
-
-if [ "$CFG_SCRIPTTOOLS" = "yes" -a "$CFG_SCRIPT" = "no" ]; then
- echo "QtScriptTools was requested, but it can't be built due to QtScript being disabled."
- exit 1
-fi
-if [ "$CFG_SCRIPTTOOLS" = "auto" -a "$CFG_SCRIPT" != "no" ]; then
- CFG_SCRIPTTOOLS="yes"
-elif [ "$CFG_SCRIPT" = "no" ]; then
- CFG_SCRIPTTOOLS="no"
+if [ "$CFG_V8SNAPSHOT" = "auto" ]; then
+ CFG_V8SNAPSHOT="$canUseV8Snapshot"
fi
-
-# No longer needed after modularization
-#if [ "$CFG_SCRIPTTOOLS" = "yes" ]; then
-# QT_CONFIG="$QT_CONFIG scripttools"
-#else
-# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPTTOOLS"
-#fi
-
-
-case "$CFG_ARCH" in
-i386|x86_64|arm|mips|macosx) ;;
-*) canBuildV8="no";;
-esac
-
-if [ "$CFG_V8" = "yes" -a "$canBuildV8" = "no" ]; then
- echo "Error: V8 was requested, but is not supported on this platform."
+if [ "$CFG_V8SNAPSHOT" = "yes" -a "$canUseV8Snapshot" = "no" ]; then
+ echo "Error: V8 snapshot was requested, but is not supported on this platform."
exit 1
fi
-
-if [ "$CFG_V8" = "auto" ]; then
- CFG_V8="$canBuildV8"
-fi
-
-if [ "$CFG_V8" = "no" ]; then
- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_V8"
-else
- QT_CONFIG="$QT_CONFIG v8"
- # Detect snapshot support
- if [ "$CFG_ARCH" != "$CFG_HOST_ARCH" ]; then
- case "$CFG_HOST_ARCH,$CFG_ARCH" in
- i386,arm)
- ;;
- *) canUseV8Snapshot="no"
- ;;
- esac
- else
- if [ -n "$_SBOX_DIR" -a "$CFG_ARCH" == "arm" ]; then
- # QEMU crashes when building inside Scratchbox with an ARM target
- canUseV8Snapshot="no"
- fi
- fi
- if [ "$CFG_V8SNAPSHOT" = "auto" ]; then
- CFG_V8SNAPSHOT="$canUseV8Snapshot"
- fi
- if [ "$CFG_V8SNAPSHOT" = "yes" -a "$canUseV8Snapshot" = "no" ]; then
- echo "Error: V8 snapshot was requested, but is not supported on this platform."
- exit 1
- fi
- if [ "$CFG_V8SNAPSHOT" = "yes" ]; then
- QT_CONFIG="$QT_CONFIG v8snapshot"
- fi
-fi
-
-if [ "$CFG_DECLARATIVE" = "yes" ]; then
- if [ "$CFG_V8" = "no" -o "$CFG_GUI" = "no" ]; then
- echo "Error: QtDeclarative was requested, but it can't be built due to QtV8 or QtGui being disabled."
- exit 1
- fi
-fi
-if [ "$CFG_DECLARATIVE" = "auto" ]; then
- if [ "$CFG_V8" = "no" -o "$CFG_GUI" = "no" ]; then
- CFG_DECLARATIVE=no
- else
- CFG_DECLARATIVE=yes
- fi
-fi
-
-if [ "$CFG_DECLARATIVE" = "yes" ]; then
- # No longer needed after modularization
- #QT_CONFIG="$QT_CONFIG declarative"
- if [ "$CFG_DECLARATIVE_DEBUG" = "no" ]; then
- QCONFIG_FLAGS="$QCONFIG_FLAGS QDECLARATIVE_NO_DEBUG_PROTOCOL"
- fi
-else
- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DECLARATIVE"
-fi
-
-if [ "$CFG_LOCATION" = "auto" ]; then
- CFG_LOCATION="$CFG_GUI"
+if [ "$CFG_V8SNAPSHOT" = "yes" ]; then
+ QT_CONFIG="$QT_CONFIG v8snapshot"
fi
-if [ "$CFG_LOCATION" = "yes" ] && [ "$CFG_GUI" = "no" ]; then
- echo "QtLocation requested, but it can't be built without QtGui"
- exit 1
-fi
-
-#Disable QtLocation until ready
-CFG_LOCATION="no"
-
-if [ "$CFG_LOCATION" = "no" ]; then
- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_LOCATION"
+# ### Vestige
+if [ "$CFG_DECLARATIVE_DEBUG" = "no" ]; then
+ QCONFIG_FLAGS="$QCONFIG_FLAGS QDECLARATIVE_NO_DEBUG_PROTOCOL"
fi
if [ "$CFG_EXCEPTIONS" = "no" ]; then
@@ -7319,14 +6881,6 @@ if [ "$CFG_EXCEPTIONS" = "no" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG exceptions_off"
fi
-# Set the minimum deployment target.
-if [ "$BUILD_ON_MAC" = "yes" ]; then
- QMakeVar add QMAKE_CFLAGS "-mmacosx-version-min=10.6"
- QMakeVar add QMAKE_CXXFLAGS "-mmacosx-version-min=10.6"
- QMakeVar add QMAKE_LFLAGS "-mmacosx-version-min=10.6"
- QMakeVar add QMAKE_OBJECTIVE_CFLAGS "-mmacosx-version-min=10.6"
-fi
-
case "$COMPILER" in
g++*)
# GNU C++
@@ -7555,18 +7109,13 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
# Add other configuration options to the qconfig.h file
[ "$CFG_GIF" = "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_BUILTIN_GIF_READER=1"
-[ "$CFG_TIFF" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_TIFF"
[ "$CFG_PNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_PNG"
[ "$CFG_JPEG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_JPEG"
-[ "$CFG_MNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_MNG"
[ "$CFG_ZLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ZLIB"
[ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS"
[ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
-# ATM we need this define to compile Qt. Remove later!
-QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_S60"
-
# X11/Unix/Mac only configs
[ "$CFG_CUPS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS"
[ "$CFG_ICONV" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICONV"
@@ -7855,7 +7404,6 @@ QT_BUILD_PARTS = $CFG_BUILD_PARTS
QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc
QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic
QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
-QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib
@@ -7939,15 +7487,6 @@ EOF
*) ;;
esac
-if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "no" ] && [ "$CFG_WEBKIT" != "no" ] && [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
- cat <<EOF
- WARNING: DWARF2 debug symbols are not enabled. Linking webkit
- in debug mode will run out of memory on systems with 2GB or less.
- Install Xcode 2.4.1 or higher to enable DWARF2, or configure with
- -no-webkit or -release to skip webkit debug.
-EOF
-fi
-
echo
if [ "$XPLATFORM" = "$PLATFORM" ]; then
echo "Build type: $PLATFORM"
@@ -7997,30 +7536,12 @@ fi
[ "$CFG_DBUS" = "linked" ] && echo "QtDBus module .......... yes (linked)"
echo "QtConcurrent code ...... $CFG_CONCURRENT"
echo "QtGui module ........... $CFG_GUI"
-echo "QtScript module ........ $CFG_SCRIPT"
-echo "QtScriptTools module ... $CFG_SCRIPTTOOLS"
-echo "QtXmlPatterns module ... $CFG_XMLPATTERNS"
-echo "Phonon module .......... $CFG_PHONON"
-echo "Multimedia module ...... $CFG_MULTIMEDIA"
-echo "SVG module ............. $CFG_SVG"
-case "$CFG_WEBKIT" in
- yes) echo "WebKit module .......... yes" ;;
- debug) echo "WebKit module .......... yes (debug)" ;;
- no) echo "WebKit module .......... no" ;;
-esac
-if [ "$CFG_WEBKIT" != "no" ] || [ "$CFG_SCRIPT" != "no" ]; then
- if [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then
- echo "JavaScriptCore JIT ..... To be decided by JavaScriptCore"
- else
- echo "JavaScriptCore JIT ..... $CFG_JAVASCRIPTCORE_JIT"
- fi
-fi
-echo "V8 module .............. $CFG_V8"
-echo "Declarative module ..... $CFG_DECLARATIVE"
-if [ "$CFG_DECLARATIVE" = "yes" ]; then
- echo "Declarative debugging ...$CFG_DECLARATIVE_DEBUG"
+if [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then
+ echo "JavaScriptCore JIT ..... To be decided by JavaScriptCore"
+else
+ echo "JavaScriptCore JIT ..... $CFG_JAVASCRIPTCORE_JIT"
fi
-echo "Location module ........ $CFG_LOCATION"
+echo "Declarative debugging ...$CFG_DECLARATIVE_DEBUG"
echo "STL support ............ $CFG_STL"
echo "PCH support ............ $CFG_PRECOMPILE"
echo "MMX/3DNOW/SSE/SSE2/SSE3. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}/${CFG_SSE3}"
@@ -8042,11 +7563,6 @@ echo "GStreamer support ...... $CFG_GSTREAMER"
echo "PulseAudio support ..... $CFG_PULSEAUDIO"
echo "Large File support ..... $CFG_LARGEFILE"
echo "GIF support ............ $CFG_GIF"
-if [ "$CFG_TIFF" = "no" ]; then
- echo "TIFF support ........... $CFG_TIFF"
-else
- echo "TIFF support ........... $CFG_TIFF ($CFG_LIBTIFF)"
-fi
if [ "$CFG_JPEG" = "no" ]; then
echo "JPEG support ........... $CFG_JPEG"
else
@@ -8057,11 +7573,6 @@ if [ "$CFG_PNG" = "no" ]; then
else
echo "PNG support ............ $CFG_PNG ($CFG_LIBPNG)"
fi
-if [ "$CFG_MNG" = "no" ]; then
- echo "MNG support ............ $CFG_MNG"
-else
- echo "MNG support ............ $CFG_MNG ($CFG_LIBMNG)"
-fi
echo "zlib support ........... $CFG_ZLIB"
echo "Session management ..... $CFG_SM"
if [ "$PLATFORM_QWS" = "yes" ]; then
@@ -8148,6 +7659,7 @@ if [ "$PLATFORM_MAC" = "yes" ]; then
echo "CoreWlan support ....... $CFG_COREWLAN"
fi
echo "libICU support ......... $CFG_ICU"
+echo "PCRE support ........... $CFG_PCRE"
if [ "$CFG_XCB_LIMITED" = "yes" ] && [ "$CFG_XCB" = "yes" ]; then
echo "Xcb support ............ limited (old version)"
else
@@ -8328,7 +7840,7 @@ PART_ROOTS=
for part in $CFG_BUILD_PARTS; do
case "$part" in
tools) PART_ROOTS="$PART_ROOTS tools" ;;
- libs) PART_ROOTS="$PART_ROOTS src tools/linguist/lrelease" ;;
+ libs) PART_ROOTS="$PART_ROOTS src" ;;
translations) PART_ROOTS="$PART_ROOTS translations" ;;
examples) PART_ROOTS="$PART_ROOTS examples" ;;
*) ;;
@@ -8358,16 +7870,8 @@ for file in .projects .projects.3; do
continue
fi
SPEC=$XQMAKESPEC ;;
- *examples/activeqt/*) continue ;;
*/qmake/qmake.pro) continue ;;
- *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*|*linguist/lrelease*) SPEC=$QMAKESPEC ;;
- *tools/mkv8snapshot/*)
- if [ "$CFG_V8" = "yes" -a "$CFG_V8SNAPSHOT" = "yes" ]; then
- SPEC=$QMAKESPEC
- else
- continue
- fi
- ;;
+ *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*) SPEC=$QMAKESPEC ;;
*) if [ "$CFG_NOPROCESS" = "yes" ]; then
continue
else
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 01:09:56 +0000