AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dead code from the configures

Browse Source 
This removes the options to disable several modules, as they are in
separate repositories now and can be "disabled" by simply not compiling
them.
Note that this leaves some configuration options for these separate
modules in, as they have no own configures. This is ugly, but has to
stay that way for the time being.

Some other dead code had to go as well, just like accepting the obsolete
-qdbus option.

Change-Id: Ibb26e4f48ca8239c2c4396e4abefab4c87322be2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Oswald Buddenhagen 2012-01-26 18:43:06 +01:00 committed by Qt by Nokia
parent 26c4ca0713
commit 1b716724f7
2 changed files with 76 additions and 658 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

526
configure vendored
View File

@ -642,9 +642,6 @@ CFG_CONFIGURE_EXIT_ON_ERROR=yes
CFG_PROFILE=no CFG_PROFILE=no
CFG_EXCEPTIONS=unspecified CFG_EXCEPTIONS=unspecified
CFG_GUI=auto # (yes|no|auto) 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_INCREMENTAL=auto
CFG_QCONFIG=full CFG_QCONFIG=full
CFG_DEBUG=auto CFG_DEBUG=auto
@ -686,18 +683,10 @@ QT_DEFAULT_BUILD_PARTS="libs examples tests"
CFG_BUILD_PARTS="" CFG_BUILD_PARTS=""
CFG_NOBUILD_PARTS="" CFG_NOBUILD_PARTS=""
CFG_RELEASE_QMAKE=no CFG_RELEASE_QMAKE=no
CFG_PHONON=auto
CFG_PHONON_BACKEND=yes
CFG_MULTIMEDIA=auto
CFG_AUDIO_BACKEND=auto CFG_AUDIO_BACKEND=auto
CFG_SVG=auto
CFG_V8=auto
CFG_V8SNAPSHOT=auto CFG_V8SNAPSHOT=auto
CFG_DECLARATIVE=auto
CFG_DECLARATIVE_DEBUG=yes CFG_DECLARATIVE_DEBUG=yes
CFG_WEBKIT=auto # (yes|no|auto|debug)
CFG_JAVASCRIPTCORE_JIT=auto CFG_JAVASCRIPTCORE_JIT=auto
CFG_LOCATION=auto
CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen directfb" CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen directfb"
CFG_GFX_ON="linuxfb multiscreen" CFG_GFX_ON="linuxfb multiscreen"
@ -947,14 +936,8 @@ if [ "$CFG_EMBEDDED" = "nacl" ]; then
L_FLAGS="$L_FLAGS -I${CFG_NACL_PATH}/toolchain/mac_x86/sdk/nacl-sdk/lib" L_FLAGS="$L_FLAGS -I${CFG_NACL_PATH}/toolchain/mac_x86/sdk/nacl-sdk/lib"
fi fi
echo "-no-multimedia -no-webkit -no-phonon -no-nultimedia -no-mediaservices -no-xmlpatterns -no-script -no-sql-sqlite -nomake tests" echo "-no-mediaservices -no-sql-sqlite -nomake tests"
CFG_MULTIMEDIA=no
CFG_WEBKIT=no
CFG_PHONON=no
CFG_MULTIMEDIA=no
CFG_MEDIASERVICES=no CFG_MEDIASERVICES=no
CFG_XMLPATTERNS=no
CFG_SCRIPT=no
CFG_SQLITE=no CFG_SQLITE=no
CFG_SQL_sqlite=no CFG_SQL_sqlite=no
CFG_LIBTIFF=no CFG_LIBTIFF=no
@ -997,26 +980,13 @@ while [ "$#" -gt 0 ]; do
VAR=`echo $1 | sed "s,^-[^-]*-\(.*\),\1,"` VAR=`echo $1 | sed "s,^-[^-]*-\(.*\),\1,"`
VAL=`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 #Qt style no options
-no-*) -no-*)
VAR=`echo $1 | sed "s,^-no-\(.*\),\1,"` VAR=`echo $1 | sed "s,^-no-\(.*\),\1,"`
VAL=no VAL=no
;; ;;
#Qt style yes options #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,"` VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
VAL=yes VAL=yes
;; ;;
@ -1930,7 +1900,7 @@ while [ "$#" -gt 0 ]; do
fi fi
fi fi
;; ;;
qdbus|dbus) dbus)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "linked" ]; then if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "linked" ]; then
CFG_DBUS="$VAL" CFG_DBUS="$VAL"
elif [ "$VAL" = "runtime" ]; then elif [ "$VAL" = "runtime" ]; then
@ -1974,72 +1944,6 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes UNKNOWN_OPT=yes
fi 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) declarative-debug)
if [ "$VAL" = "yes" ]; then if [ "$VAL" = "yes" ]; then
CFG_DECLARATIVE_DEBUG="yes" CFG_DECLARATIVE_DEBUG="yes"
@ -2051,21 +1955,6 @@ while [ "$#" -gt 0 ]; do
fi fi
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) javascript-jit)
if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ] || [ "$VAL" = "no" ]; then if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ] || [ "$VAL" = "no" ]; then
CFG_JAVASCRIPTCORE_JIT="$VAL" CFG_JAVASCRIPTCORE_JIT="$VAL"
@ -2270,13 +2159,6 @@ while [ "$#" -gt 0 ]; do
silent) silent)
CFG_SILENT="$VAL" CFG_SILENT="$VAL"
;; ;;
phonon)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_PHONON="$VAL"
else
UNKNOWN_OPT=yes
fi
;;
phonon-backend) phonon-backend)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_PHONON_BACKEND="$VAL" CFG_PHONON_BACKEND="$VAL"
@ -2284,13 +2166,6 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes UNKNOWN_OPT=yes
fi fi
;; ;;
multimedia)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_MULTIMEDIA="$VAL"
else
UNKNOWN_OPT=yes
fi
;;
dont-process) dont-process)
CFG_NOPROCESS=yes CFG_NOPROCESS=yes
;; ;;
@ -2498,11 +2373,6 @@ if [ "$OPT_SHADOW" = "yes" ]; then
# symlink the doc directory # symlink the doc directory
rm -rf "$outpath/doc" rm -rf "$outpath/doc"
ln -s "$relpath/doc" "$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 fi
# symlink fonts to be able to run application from build directory # symlink fonts to be able to run application from build directory
@ -3558,15 +3428,12 @@ Usage: $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir
[-no-separate-debug-info] [-no-mmx] [-no-3dnow] [-no-sse] [-no-sse2] [-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] [-no-sse3] [-no-ssse3] [-no-sse4.1] [-no-sse4.2] [-no-avx] [-no-neon]
[-qtnamespace <namespace>] [-qtlibinfix <infix>] [-separate-debug-info] [-armfpa] [-qtnamespace <namespace>] [-qtlibinfix <infix>] [-separate-debug-info] [-armfpa]
[-no-optimized-qmake] [-optimized-qmake] [-no-xmlpatterns] [-xmlpatterns] [-no-phonon-backend] [-phonon-backend] [-no-media-backend] [-media-backend]
[-no-multimedia] [-multimedia] [-no-phonon] [-phonon] [-no-phonon-backend] [-phonon-backend] [-no-audio-backend] [-audio-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-openssl] [-openssl] [-openssl-linked]
[-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit] [-webkit-debug] [-no-gtkstyle] [-gtkstyle]
[-no-javascript-jit] [-javascript-jit]
[-no-script] [-script] [-no-scripttools] [-scripttools]
[-no-declarative] [-declarative] [-no-declarative-debug] [-declarative-debug]
[-no-location] [-location]
[-qt-pcre] [-system-pcre] [-qt-pcre] [-system-pcre]
[additional platform specific options (see below)] [additional platform specific options (see below)]
@ -3690,52 +3557,15 @@ fi
-system-sqlite ..... Use sqlite from the operating system. -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. -no-phonon-backend.. Do not build the platform phonon plugin.
+ -phonon-backend..... 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. -no-javascript-jit . Do not build the JavaScriptCore JIT compiler.
+ -javascript-jit .... 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. -no-declarative-debug ..... Do not build the declarative debugging support.
+ -declarative-debug ....... 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 -platform target ... The operating system and compiler you are building
on ($PLATFORM). on ($PLATFORM).
@ -5294,15 +5124,6 @@ if [ "$CFG_DBUS" != "no" ]; then
fi fi
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 # X11/QWS/Lighthouse
if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then
@ -5329,64 +5150,29 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "ye
fi fi
fi fi
if [ "$CFG_GUI" = "no" ]; then # ### Vestige
if [ "$CFG_PHONON" = "auto" ]; then if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then
CFG_PHONON=no 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
if [ "$CFG_PHONON" != "no" ]; then 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
echo "Phonon enabled, but GUI disabled." CFG_GSTREAMER=yes
echo " You might need to either enable the GUI or disable Phonon" QMakeVar set QT_CFLAGS_GSTREAMER "$QT_CFLAGS_GSTREAMER"
exit 1 QMakeVar set QT_LIBS_GSTREAMER "$QT_LIBS_GSTREAMER"
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"
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
fi
elif [ "$CFG_GLIB" = "no" ]; then
CFG_GSTREAMER=no
fi
else
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 else
CFG_PHONON=yes 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
fi fi
elif [ "$CFG_GLIB" = "no" ]; then
CFG_GSTREAMER=no
fi fi
# auto-detect libicu support # auto-detect libicu support
@ -5609,12 +5395,6 @@ if [ "$PLATFORM_X11" = "yes" ]; then
fi fi
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 # auto-detect MIT-SHM support
if [ "$CFG_MITSHM" != "no" ]; then 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 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
@ -6569,15 +6349,10 @@ if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_ARCHS" = "" ]; then
CFG_MAC_ARCHS=" $QT_MAC_DEFAULT_ARCH" CFG_MAC_ARCHS=" $QT_MAC_DEFAULT_ARCH"
[ "$OPT_VERBOSE" = "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS." [ "$OPT_VERBOSE" = "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS."
fi fi
# enable Phonon
if [ "$CFG_PHONON" = "yes" ]; then # ### Vestige
# No longer needed after modularization if [ "$CFG_PHONON_BACKEND" = "yes" ]; then
#QT_CONFIG="$QT_CONFIG phonon" QT_CONFIG="$QT_CONFIG phonon-backend"
if [ "$CFG_PHONON_BACKEND" = "yes" ]; then
QT_CONFIG="$QT_CONFIG phonon-backend"
fi
else
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PHONON"
fi fi
# disable accessibility # disable accessibility
@ -6971,18 +6746,9 @@ fi
# See Qt documentation for more information on which features are # See Qt documentation for more information on which features are
# supported and on which compilers. # supported and on which compilers.
# #
canBuildQtXmlPatterns="yes"
canBuildWebKit="$HAVE_STL"
canBuildQtConcurrent="yes" canBuildQtConcurrent="yes"
canBuildV8="yes"
canUseV8Snapshot="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 case "$XPLATFORM" in
hpux-g++*) hpux-g++*)
# PA-RISC's assembly is too limited # PA-RISC's assembly is too limited
@ -7106,172 +6872,46 @@ else
QT_CONFIG="$QT_CONFIG concurrent" QT_CONFIG="$QT_CONFIG concurrent"
fi fi
if [ "$CFG_XMLPATTERNS" = "yes" -a "$CFG_EXCEPTIONS" = "no" ]; then # ### Vestige
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
if [ "$CFG_AUDIO_BACKEND" = "yes" ]; then if [ "$CFG_AUDIO_BACKEND" = "yes" ]; then
QT_CONFIG="$QT_CONFIG audio-backend" QT_CONFIG="$QT_CONFIG audio-backend"
fi fi
if [ "$CFG_SVG" = "auto" ]; then # ### Vestige
CFG_SVG=$CFG_GUI if [ "$CFG_WEBKIT" = "debug" ]; then
QMAKE_CONFIG="$QMAKE_CONFIG webkit-debug"
fi fi
if [ "$CFG_SVG" = "yes" ] && [ "$CFG_GUI" = "no" ]; then # ### Vestige
echo "QtSvg requested, but it can't be built without QtGui" QT_CONFIG="$QT_CONFIG v8"
exit 1 # Detect snapshot support
fi if [ "$CFG_ARCH" != "$CFG_HOST_ARCH" ]; then
case "$CFG_HOST_ARCH,$CFG_ARCH" in
if [ "$CFG_SVG" = "yes" ]; then i386,arm)
QT_CONFIG="$QT_CONFIG svg" ;;
*) canUseV8Snapshot="no"
;;
esac
else else
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SVG" if [ -n "$_SBOX_DIR" -a "$CFG_ARCH" == "arm" ]; then
fi # QEMU crashes when building inside Scratchbox with an ARM target
canUseV8Snapshot="no"
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"
fi fi
fi fi
if [ "$CFG_V8SNAPSHOT" = "auto" ]; then
if [ "$CFG_SCRIPT" = "auto" ]; then CFG_V8SNAPSHOT="$canUseV8Snapshot"
CFG_SCRIPT="yes"
fi fi
if [ "$CFG_V8SNAPSHOT" = "yes" -a "$canUseV8Snapshot" = "no" ]; then
# No longer needed after modularization echo "Error: V8 snapshot was requested, but is not supported on this platform."
#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 exit 1
fi fi
if [ "$CFG_SCRIPTTOOLS" = "auto" -a "$CFG_SCRIPT" != "no" ]; then if [ "$CFG_V8SNAPSHOT" = "yes" ]; then
CFG_SCRIPTTOOLS="yes" QT_CONFIG="$QT_CONFIG v8snapshot"
elif [ "$CFG_SCRIPT" = "no" ]; then
CFG_SCRIPTTOOLS="no"
fi fi
# No longer needed after modularization # ### Vestige
#if [ "$CFG_SCRIPTTOOLS" = "yes" ]; then if [ "$CFG_DECLARATIVE_DEBUG" = "no" ]; then
# QT_CONFIG="$QT_CONFIG scripttools" QCONFIG_FLAGS="$QCONFIG_FLAGS QDECLARATIVE_NO_DEBUG_PROTOCOL"
#else
# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPTTOOLS"
#fi
case "$CFG_ARCH" in
i386|x86_64|arm|mips) ;;
*) canBuildV8="no";;
esac
if [ "$CFG_V8" = "yes" -a "$canBuildV8" = "no" ]; then
echo "Error: V8 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"
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"
fi fi
if [ "$CFG_EXCEPTIONS" = "no" ]; then if [ "$CFG_EXCEPTIONS" = "no" ]; then
@ -7823,7 +7463,6 @@ QT_BUILD_PARTS = $CFG_BUILD_PARTS
QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc QMAKE_MOC = \$\$QT_BUILD_TREE/bin/moc
QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic QMAKE_UIC = \$\$QT_BUILD_TREE/bin/uic
QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc QMAKE_RCC = \$\$QT_BUILD_TREE/bin/rcc
QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include QMAKE_INCDIR_QT = \$\$QT_BUILD_TREE/include
QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib
@ -7907,15 +7546,6 @@ EOF
*) ;; *) ;;
esac 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 echo
if [ "$XPLATFORM" = "$PLATFORM" ]; then if [ "$XPLATFORM" = "$PLATFORM" ]; then
echo "Build type: $PLATFORM" echo "Build type: $PLATFORM"
@ -7965,30 +7595,12 @@ fi
[ "$CFG_DBUS" = "linked" ] && echo "QtDBus module .......... yes (linked)" [ "$CFG_DBUS" = "linked" ] && echo "QtDBus module .......... yes (linked)"
echo "QtConcurrent code ...... $CFG_CONCURRENT" echo "QtConcurrent code ...... $CFG_CONCURRENT"
echo "QtGui module ........... $CFG_GUI" echo "QtGui module ........... $CFG_GUI"
echo "QtScript module ........ $CFG_SCRIPT" if [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then
echo "QtScriptTools module ... $CFG_SCRIPTTOOLS" echo "JavaScriptCore JIT ..... To be decided by JavaScriptCore"
echo "QtXmlPatterns module ... $CFG_XMLPATTERNS" else
echo "Phonon module .......... $CFG_PHONON" echo "JavaScriptCore JIT ..... $CFG_JAVASCRIPTCORE_JIT"
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 fi
echo "V8 module .............. $CFG_V8" echo "Declarative debugging ...$CFG_DECLARATIVE_DEBUG"
echo "Declarative module ..... $CFG_DECLARATIVE"
if [ "$CFG_DECLARATIVE" = "yes" ]; then
echo "Declarative debugging ...$CFG_DECLARATIVE_DEBUG"
fi
echo "Location module ........ $CFG_LOCATION"
echo "STL support ............ $CFG_STL" echo "STL support ............ $CFG_STL"
echo "PCH support ............ $CFG_PRECOMPILE" echo "PCH support ............ $CFG_PRECOMPILE"
echo "MMX/3DNOW/SSE/SSE2/SSE3. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}/${CFG_SSE3}" echo "MMX/3DNOW/SSE/SSE2/SSE3. ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}/${CFG_SSE3}"
@ -8292,7 +7904,7 @@ PART_ROOTS=
for part in $CFG_BUILD_PARTS; do for part in $CFG_BUILD_PARTS; do
case "$part" in case "$part" in
tools) PART_ROOTS="$PART_ROOTS tools" ;; 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" ;; translations) PART_ROOTS="$PART_ROOTS translations" ;;
examples) PART_ROOTS="$PART_ROOTS examples" ;; examples) PART_ROOTS="$PART_ROOTS examples" ;;
*) ;; *) ;;
@ -8322,16 +7934,8 @@ for file in .projects .projects.3; do
continue continue
fi fi
SPEC=$XQMAKESPEC ;; SPEC=$XQMAKESPEC ;;
*examples/activeqt/*) continue ;;
*/qmake/qmake.pro) continue ;; */qmake/qmake.pro) continue ;;
*tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*|*linguist/lrelease*) SPEC=$QMAKESPEC ;; *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*) SPEC=$QMAKESPEC ;;
*tools/mkv8snapshot/*)
if [ "$CFG_V8" = "yes" -a "$CFG_V8SNAPSHOT" = "yes" ]; then
SPEC=$QMAKESPEC
else
continue
fi
;;
*) if [ "$CFG_NOPROCESS" = "yes" ]; then *) if [ "$CFG_NOPROCESS" = "yes" ]; then
continue continue
else else

208
tools/configure/configureapp.cpp
View File

@ -244,19 +244,11 @@ Configure::Configure(int& argc, char** argv)
dictionary[ "CE_CRT" ] = "no"; dictionary[ "CE_CRT" ] = "no";
dictionary[ "CETEST" ] = "auto"; dictionary[ "CETEST" ] = "auto";
dictionary[ "CE_SIGNATURE" ] = "no"; dictionary[ "CE_SIGNATURE" ] = "no";
dictionary[ "SCRIPT" ] = "auto";
dictionary[ "SCRIPTTOOLS" ] = "auto";
dictionary[ "XMLPATTERNS" ] = "auto";
dictionary[ "PHONON" ] = "auto";
dictionary[ "PHONON_BACKEND" ] = "yes"; dictionary[ "PHONON_BACKEND" ] = "yes";
dictionary[ "MULTIMEDIA" ] = "yes";
dictionary[ "AUDIO_BACKEND" ] = "auto"; dictionary[ "AUDIO_BACKEND" ] = "auto";
dictionary[ "WMSDK" ] = "auto"; dictionary[ "WMSDK" ] = "auto";
dictionary[ "DIRECTSHOW" ] = "no"; dictionary[ "DIRECTSHOW" ] = "no";
dictionary[ "WEBKIT" ] = "auto";
dictionary[ "V8" ] = "yes";
dictionary[ "V8SNAPSHOT" ] = "auto"; dictionary[ "V8SNAPSHOT" ] = "auto";
dictionary[ "DECLARATIVE" ] = "auto";
dictionary[ "DECLARATIVE_DEBUG" ]= "yes"; dictionary[ "DECLARATIVE_DEBUG" ]= "yes";
dictionary[ "PLUGIN_MANIFESTS" ] = "yes"; dictionary[ "PLUGIN_MANIFESTS" ] = "yes";
dictionary[ "DIRECTWRITE" ] = "no"; dictionary[ "DIRECTWRITE" ] = "no";
@ -879,50 +871,16 @@ void Configure::parseCmdLine()
dictionary[ "DBUS" ] = "yes"; dictionary[ "DBUS" ] = "yes";
} else if (configCmdLine.at(i) == "-dbus-linked") { } else if (configCmdLine.at(i) == "-dbus-linked") {
dictionary[ "DBUS" ] = "linked"; dictionary[ "DBUS" ] = "linked";
} else if (configCmdLine.at(i) == "-no-script") {
dictionary[ "SCRIPT" ] = "no";
} else if (configCmdLine.at(i) == "-script") {
dictionary[ "SCRIPT" ] = "yes";
} else if (configCmdLine.at(i) == "-no-scripttools") {
dictionary[ "SCRIPTTOOLS" ] = "no";
} else if (configCmdLine.at(i) == "-scripttools") {
dictionary[ "SCRIPTTOOLS" ] = "yes";
} else if (configCmdLine.at(i) == "-no-xmlpatterns") {
dictionary[ "XMLPATTERNS" ] = "no";
} else if (configCmdLine.at(i) == "-xmlpatterns") {
dictionary[ "XMLPATTERNS" ] = "yes";
} else if (configCmdLine.at(i) == "-no-multimedia") {
dictionary[ "MULTIMEDIA" ] = "no";
} else if (configCmdLine.at(i) == "-multimedia") {
dictionary[ "MULTIMEDIA" ] = "yes";
} else if (configCmdLine.at(i) == "-audio-backend") { } else if (configCmdLine.at(i) == "-audio-backend") {
dictionary[ "AUDIO_BACKEND" ] = "yes"; dictionary[ "AUDIO_BACKEND" ] = "yes";
} else if (configCmdLine.at(i) == "-no-audio-backend") { } else if (configCmdLine.at(i) == "-no-audio-backend") {
dictionary[ "AUDIO_BACKEND" ] = "no"; dictionary[ "AUDIO_BACKEND" ] = "no";
} else if (configCmdLine.at(i) == "-no-phonon") {
dictionary[ "PHONON" ] = "no";
} else if (configCmdLine.at(i) == "-phonon") {
dictionary[ "PHONON" ] = "yes";
} else if (configCmdLine.at(i) == "-no-phonon-backend") { } else if (configCmdLine.at(i) == "-no-phonon-backend") {
dictionary[ "PHONON_BACKEND" ] = "no"; dictionary[ "PHONON_BACKEND" ] = "no";
} else if (configCmdLine.at(i) == "-phonon-backend") { } else if (configCmdLine.at(i) == "-phonon-backend") {
dictionary[ "PHONON_BACKEND" ] = "yes"; dictionary[ "PHONON_BACKEND" ] = "yes";
} else if (configCmdLine.at(i) == "-phonon-wince-ds9") { } else if (configCmdLine.at(i) == "-phonon-wince-ds9") {
dictionary[ "DIRECTSHOW" ] = "yes"; dictionary[ "DIRECTSHOW" ] = "yes";
} else if (configCmdLine.at(i) == "-no-webkit") {
dictionary[ "WEBKIT" ] = "no";
} else if (configCmdLine.at(i) == "-webkit") {
dictionary[ "WEBKIT" ] = "yes";
} else if (configCmdLine.at(i) == "-webkit-debug") {
dictionary[ "WEBKIT" ] = "debug";
} else if (configCmdLine.at(i) == "-no-v8") {
dictionary[ "V8" ] = "no";
} else if (configCmdLine.at(i) == "-v8") {
dictionary[ "V8" ] = "yes";
} else if (configCmdLine.at(i) == "-no-declarative") {
dictionary[ "DECLARATIVE" ] = "no";
} else if (configCmdLine.at(i) == "-declarative") {
dictionary[ "DECLARATIVE" ] = "yes";
} else if (configCmdLine.at(i) == "-no-declarative-debug") { } else if (configCmdLine.at(i) == "-no-declarative-debug") {
dictionary[ "DECLARATIVE_DEBUG" ] = "no"; dictionary[ "DECLARATIVE_DEBUG" ] = "no";
} else if (configCmdLine.at(i) == "-declarative-debug") { } else if (configCmdLine.at(i) == "-declarative-debug") {
@ -1439,8 +1397,6 @@ void Configure::applySpecSpecifics()
dictionary[ "MMX" ] = "no"; dictionary[ "MMX" ] = "no";
dictionary[ "IWMMXT" ] = "no"; dictionary[ "IWMMXT" ] = "no";
dictionary[ "CE_CRT" ] = "yes"; dictionary[ "CE_CRT" ] = "yes";
dictionary[ "WEBKIT" ] = "no";
dictionary[ "PHONON" ] = "yes";
dictionary[ "DIRECTSHOW" ] = "no"; dictionary[ "DIRECTSHOW" ] = "no";
// We only apply MMX/IWMMXT for mkspecs we know they work // We only apply MMX/IWMMXT for mkspecs we know they work
if (dictionary[ "XQMAKESPEC" ].startsWith("wincewm")) { if (dictionary[ "XQMAKESPEC" ].startsWith("wincewm")) {
@ -1516,10 +1472,6 @@ bool Configure::displayHelp()
{ {
if (dictionary[ "HELP" ] == "yes") { if (dictionary[ "HELP" ] == "yes") {
desc("Usage: configure\n" desc("Usage: configure\n"
// desc("Usage: configure [-prefix dir] [-bindir <dir>] [-libdir <dir>]\n"
// "[-docdir <dir>] [-headerdir <dir>] [-plugindir <dir>]\n"
// "[-importdir <dir>] [-datadir <dir>] [-translationdir <dir>]\n"
// "[-examplesdir <dir>]\n"
"[-release] [-debug] [-debug-and-release] [-shared] [-static]\n" "[-release] [-debug] [-debug-and-release] [-shared] [-static]\n"
"[-no-fast] [-fast] [-no-exceptions] [-exceptions]\n" "[-no-fast] [-fast] [-no-exceptions] [-exceptions]\n"
"[-no-accessibility] [-accessibility] [-no-rtti] [-rtti]\n" "[-no-accessibility] [-accessibility] [-no-rtti] [-rtti]\n"
@ -1546,24 +1498,6 @@ bool Configure::displayHelp()
desc("Installation options:\n\n"); desc("Installation options:\n\n");
#if !defined(EVAL) #if !defined(EVAL)
/*
desc(" These are optional, but you may specify install directories.\n\n", 0, 1);
desc( "-prefix dir", "This will install everything relative to dir\n(default $QT_INSTALL_PREFIX)\n");
desc(" You may use these to separate different parts of the install:\n\n", 0, 1);
desc( "-bindir <dir>", "Executables will be installed to dir\n(default PREFIX/bin)");
desc( "-libdir <dir>", "Libraries will be installed to dir\n(default PREFIX/lib)");
desc( "-docdir <dir>", "Documentation will be installed to dir\n(default PREFIX/doc)");
desc( "-headerdir <dir>", "Headers will be installed to dir\n(default PREFIX/include)");
desc( "-plugindir <dir>", "Plugins will be installed to dir\n(default PREFIX/plugins)");
desc( "-importdir <dir>", "Imports for QML will be installed to dir\n(default PREFIX/imports)");
desc( "-datadir <dir>", "Data used by Qt programs will be installed to dir\n(default PREFIX)");
desc( "-translationdir <dir>","Translations of Qt programs will be installed to dir\n(default PREFIX/translations)\n");
desc( "-examplesdir <dir>", "Examples will be installed to dir\n(default PREFIX/examples)");
*/
desc("Configure options:\n\n"); desc("Configure options:\n\n");
desc(" The defaults (*) are usually acceptable. A plus (+) denotes a default value" desc(" The defaults (*) are usually acceptable. A plus (+) denotes a default value"
@ -1709,25 +1643,10 @@ bool Configure::displayHelp()
desc("DBUS", "no", "-no-dbus", "Do not compile in D-Bus support"); desc("DBUS", "no", "-no-dbus", "Do not compile in D-Bus support");
desc("DBUS", "yes", "-dbus", "Compile in D-Bus support and load libdbus-1 dynamically"); desc("DBUS", "yes", "-dbus", "Compile in D-Bus support and load libdbus-1 dynamically");
desc("DBUS", "linked", "-dbus-linked", "Compile in D-Bus support and link to libdbus-1"); desc("DBUS", "linked", "-dbus-linked", "Compile in D-Bus support and link to libdbus-1");
desc("PHONON", "no", "-no-phonon", "Do not compile in the Phonon module");
desc("PHONON", "yes", "-phonon", "Compile the Phonon module (Phonon is built if a decent C++ compiler is used.)");
desc("PHONON_BACKEND","no", "-no-phonon-backend","Do not compile the platform-specific Phonon backend-plugin"); desc("PHONON_BACKEND","no", "-no-phonon-backend","Do not compile the platform-specific Phonon backend-plugin");
desc("PHONON_BACKEND","yes","-phonon-backend", "Compile in the platform-specific Phonon backend-plugin"); desc("PHONON_BACKEND","yes","-phonon-backend", "Compile in the platform-specific Phonon backend-plugin");
desc("MULTIMEDIA", "no", "-no-multimedia", "Do not compile the multimedia module");
desc("MULTIMEDIA", "yes","-multimedia", "Compile in multimedia module");
desc("AUDIO_BACKEND", "no","-no-audio-backend", "Do not compile in the platform audio backend into QtMultimedia"); desc("AUDIO_BACKEND", "no","-no-audio-backend", "Do not compile in the platform audio backend into QtMultimedia");
desc("AUDIO_BACKEND", "yes","-audio-backend", "Compile in the platform audio backend into QtMultimedia"); desc("AUDIO_BACKEND", "yes","-audio-backend", "Compile in the platform audio backend into QtMultimedia");
desc("WEBKIT", "no", "-no-webkit", "Do not compile in the WebKit module");
desc("WEBKIT", "yes", "-webkit", "Compile in the WebKit module (WebKit is built if a decent C++ compiler is used.)");
desc("WEBKIT", "debug", "-webkit-debug", "Compile in the WebKit module with debug symbols.");
desc("SCRIPT", "no", "-no-script", "Do not build the QtScript module.");
desc("SCRIPT", "yes", "-script", "Build the QtScript module.");
desc("SCRIPTTOOLS", "no", "-no-scripttools", "Do not build the QtScriptTools module.");
desc("SCRIPTTOOLS", "yes", "-scripttools", "Build the QtScriptTools module.");
desc("V8", "no", "-no-v8", "Do not build the V8 module.");
desc("V8", "yes", "-v8", "Build the V8 module.");
desc("DECLARATIVE", "no", "-no-declarative", "Do not build the declarative module");
desc("DECLARATIVE", "yes", "-declarative", "Build the declarative module");
desc("DECLARATIVE_DEBUG", "no", "-no-declarative-debug", "Do not build the declarative debugging support"); desc("DECLARATIVE_DEBUG", "no", "-no-declarative-debug", "Do not build the declarative debugging support");
desc("DECLARATIVE_DEBUG", "yes", "-declarative-debug", "Build the declarative debugging support"); desc("DECLARATIVE_DEBUG", "yes", "-declarative-debug", "Build the declarative debugging support");
desc("DIRECTWRITE", "no", "-no-directwrite", "Do not build support for DirectWrite font rendering"); desc("DIRECTWRITE", "no", "-no-directwrite", "Do not build support for DirectWrite font rendering");
@ -1993,8 +1912,6 @@ bool Configure::checkAvailability(const QString &part)
} }
else if (part == "INCREDIBUILD_XGE") else if (part == "INCREDIBUILD_XGE")
available = findFile("BuildConsole.exe") && findFile("xgConsole.exe"); available = findFile("BuildConsole.exe") && findFile("xgConsole.exe");
else if (part == "XMLPATTERNS")
available = dictionary.value("EXCEPTIONS") == "yes";
else if (part == "PHONON") { else if (part == "PHONON") {
available = findFile("vmr9.h") && findFile("dshow.h") && findFile("dmo.h") && findFile("dmodshow.h") available = findFile("vmr9.h") && findFile("dshow.h") && findFile("dmo.h") && findFile("dmodshow.h")
&& (findFile("strmiids.lib") || findFile("libstrmiids.a")) && (findFile("strmiids.lib") || findFile("libstrmiids.a"))
@ -2015,17 +1932,8 @@ bool Configure::checkAvailability(const QString &part)
} }
} else if (part == "WMSDK") { } else if (part == "WMSDK") {
available = findFile("wmsdk.h"); available = findFile("wmsdk.h");
} else if (part == "MULTIMEDIA" || part == "SCRIPT" || part == "SCRIPTTOOLS" || part == "V8" || part == "DECLARATIVE") {
available = true;
} else if (part == "V8SNAPSHOT") { } else if (part == "V8SNAPSHOT") {
available = true; available = true;
} else if (part == "WEBKIT") {
available = (dictionary.value("QMAKESPEC") == "win32-msvc2005") || (dictionary.value("QMAKESPEC") == "win32-msvc2008") || (dictionary.value("QMAKESPEC") == "win32-msvc2010") || (dictionary.value("QMAKESPEC") == "win32-g++");
if (dictionary[ "SHARED" ] == "no") {
cout << endl << "WARNING: Using static linking will disable the WebKit module." << endl
<< endl;
available = false;
}
} else if (part == "AUDIO_BACKEND") { } else if (part == "AUDIO_BACKEND") {
available = true; available = true;
} else if (part == "DIRECTWRITE") { } else if (part == "DIRECTWRITE") {
@ -2106,22 +2014,8 @@ void Configure::autoDetection()
dictionary["OPENSSL"] = checkAvailability("OPENSSL") ? "yes" : "no"; dictionary["OPENSSL"] = checkAvailability("OPENSSL") ? "yes" : "no";
if (dictionary["DBUS"] == "auto") if (dictionary["DBUS"] == "auto")
dictionary["DBUS"] = checkAvailability("DBUS") ? "yes" : "no"; dictionary["DBUS"] = checkAvailability("DBUS") ? "yes" : "no";
if (dictionary["SCRIPT"] == "auto")
dictionary["SCRIPT"] = checkAvailability("SCRIPT") ? "yes" : "no";
if (dictionary["SCRIPTTOOLS"] == "auto")
dictionary["SCRIPTTOOLS"] = dictionary["SCRIPT"] == "yes" ? "yes" : "no";
if (dictionary["XMLPATTERNS"] == "auto")
dictionary["XMLPATTERNS"] = checkAvailability("XMLPATTERNS") ? "yes" : "no";
if (dictionary["PHONON"] == "auto")
dictionary["PHONON"] = checkAvailability("PHONON") ? "yes" : "no";
if (dictionary["WEBKIT"] == "auto")
dictionary["WEBKIT"] = checkAvailability("WEBKIT") ? "yes" : "no";
if (dictionary["V8"] == "auto")
dictionary["V8"] = checkAvailability("V8") ? "yes" : "no";
if (dictionary["V8SNAPSHOT"] == "auto") if (dictionary["V8SNAPSHOT"] == "auto")
dictionary["V8SNAPSHOT"] = (dictionary["V8"] == "yes") && checkAvailability("V8SNAPSHOT") ? "yes" : "no"; dictionary["V8SNAPSHOT"] = (dictionary["V8"] == "yes") && checkAvailability("V8SNAPSHOT") ? "yes" : "no";
if (dictionary["DECLARATIVE"] == "auto")
dictionary["DECLARATIVE"] = dictionary["V8"] == "yes" ? "yes" : "no";
if (dictionary["DECLARATIVE_DEBUG"] == "auto") if (dictionary["DECLARATIVE_DEBUG"] == "auto")
dictionary["DECLARATIVE_DEBUG"] = dictionary["DECLARATIVE"] == "yes" ? "yes" : "no"; dictionary["DECLARATIVE_DEBUG"] = dictionary["DECLARATIVE"] == "yes" ? "yes" : "no";
if (dictionary["AUDIO_BACKEND"] == "auto") if (dictionary["AUDIO_BACKEND"] == "auto")
@ -2179,16 +2073,6 @@ bool Configure::verifyConfiguration()
if (!(l.contains(dictionary["ARM_FPU_TYPE"]))) if (!(l.contains(dictionary["ARM_FPU_TYPE"])))
cout << QString("WARNING: Using unsupported fpu flag: %1").arg(dictionary["ARM_FPU_TYPE"]) << endl; cout << QString("WARNING: Using unsupported fpu flag: %1").arg(dictionary["ARM_FPU_TYPE"]) << endl;
} }
if (dictionary["DECLARATIVE"] == "yes" && dictionary["V8"] == "no") {
cout << "WARNING: To be able to compile QtDeclarative we need to also compile the" << endl
<< "V8 module. If you continue, we will turn on the V8 module." << endl
<< "(Press any key to continue..)";
if (_getch() == 3) // _Any_ keypress w/no echo(eat <Enter> for stdout)
exit(0); // Exit cleanly for Ctrl+C
dictionary["SCRIPT"] = "yes";
}
if (dictionary["DIRECTWRITE"] == "yes" && !checkAvailability("DIRECTWRITE")) { if (dictionary["DIRECTWRITE"] == "yes" && !checkAvailability("DIRECTWRITE")) {
cout << "WARNING: To be able to compile the DirectWrite font engine you will" << endl cout << "WARNING: To be able to compile the DirectWrite font engine you will" << endl
<< "need the Microsoft DirectWrite and Microsoft Direct2D development" << endl << "need the Microsoft DirectWrite and Microsoft Direct2D development" << endl
@ -2430,6 +2314,7 @@ void Configure::generateOutputVars()
qtConfig += "egl"; qtConfig += "egl";
} }
// ### Vestige
if (dictionary["DIRECTSHOW"] == "yes") if (dictionary["DIRECTSHOW"] == "yes")
qtConfig += "directshow"; qtConfig += "directshow";
@ -2446,52 +2331,13 @@ void Configure::generateOutputVars()
if (dictionary[ "CETEST" ] == "yes") if (dictionary[ "CETEST" ] == "yes")
qtConfig += "cetest"; qtConfig += "cetest";
// No longer needed after modularization // ### Vestige
// if (dictionary[ "SCRIPT" ] == "yes") if (dictionary["PHONON_BACKEND"] == "yes")
// qtConfig += "script"; qtConfig += "phonon-backend";
// No longer needed after modularization // ### Vestige
// if (dictionary[ "SCRIPTTOOLS" ] == "yes") { if (dictionary["AUDIO_BACKEND"] == "yes")
// if (dictionary[ "SCRIPT" ] == "no") { qtConfig += "audio-backend";
// cout << "QtScriptTools was requested, but it can't be built due to QtScript being "
// "disabled." << endl;
// dictionary[ "DONE" ] = "error";
// }
// qtConfig += "scripttools";
// }
// No longer needed after modularization
// if (dictionary[ "XMLPATTERNS" ] == "yes")
// qtConfig += "xmlpatterns";
if (dictionary["PHONON"] == "yes") {
// No longer needed after modularization
//qtConfig += "phonon";
if (dictionary["PHONON_BACKEND"] == "yes")
qtConfig += "phonon-backend";
}
if (dictionary["MULTIMEDIA"] == "yes") {
// No longer needed after modularization
//qtConfig += "multimedia";
if (dictionary["AUDIO_BACKEND"] == "yes")
qtConfig += "audio-backend";
}
if (dictionary["WEBKIT"] != "no") {
if (dictionary["WEBKIT"] == "debug")
qtConfig += "webkit-debug";
}
// No longer needed after modularization
// if (dictionary["DECLARATIVE"] == "yes") {
// if (dictionary[ "V8" ] == "no") {
// cout << "QtDeclarative was requested, but it can't be built due to V8 being "
// "disabled." << endl;
// dictionary[ "DONE" ] = "error";
// }
// qtConfig += "declarative";
// }
if (dictionary["DIRECTWRITE"] == "yes") if (dictionary["DIRECTWRITE"] == "yes")
qtConfig += "directwrite"; qtConfig += "directwrite";
@ -2499,16 +2345,12 @@ void Configure::generateOutputVars()
if (dictionary[ "NATIVE_GESTURES" ] == "yes") if (dictionary[ "NATIVE_GESTURES" ] == "yes")
qtConfig += "native-gestures"; qtConfig += "native-gestures";
// We currently have no switch for QtSvg, so add it unconditionally.
qtConfig += "svg";
// We currently have no switch for QtConcurrent, so add it unconditionally. // We currently have no switch for QtConcurrent, so add it unconditionally.
qtConfig += "concurrent"; qtConfig += "concurrent";
if (dictionary[ "V8" ] == "yes") { // ### Vestige
qtConfig += "v8"; if (dictionary[ "V8SNAPSHOT" ] == "yes")
if (dictionary[ "V8SNAPSHOT" ] == "yes") qtConfig += "v8snapshot";
qtConfig += "v8snapshot";
}
// Add config levels -------------------------------------------- // Add config levels --------------------------------------------
QStringList possible_configs = QStringList() QStringList possible_configs = QStringList()
@ -2913,15 +2755,7 @@ void Configure::generateConfigfiles()
} }
if (dictionary["OPENSSL"] == "linked") qconfigList += "QT_LINKED_OPENSSL"; if (dictionary["OPENSSL"] == "linked") qconfigList += "QT_LINKED_OPENSSL";
if (dictionary["DBUS"] == "no") qconfigList += "QT_NO_DBUS"; if (dictionary["DBUS"] == "no") qconfigList += "QT_NO_DBUS";
if (dictionary["WEBKIT"] == "no") qconfigList += "QT_NO_WEBKIT";
if (dictionary["V8"] == "no") qconfigList += "QT_NO_V8";
if (dictionary["DECLARATIVE"] == "no") qconfigList += "QT_NO_DECLARATIVE";
if (dictionary["DECLARATIVE_DEBUG"] == "no") qconfigList += "QDECLARATIVE_NO_DEBUG_PROTOCOL"; if (dictionary["DECLARATIVE_DEBUG"] == "no") qconfigList += "QDECLARATIVE_NO_DEBUG_PROTOCOL";
if (dictionary["PHONON"] == "no") qconfigList += "QT_NO_PHONON";
if (dictionary["MULTIMEDIA"] == "no") qconfigList += "QT_NO_MULTIMEDIA";
if (dictionary["XMLPATTERNS"] == "no") qconfigList += "QT_NO_XMLPATTERNS";
if (dictionary["SCRIPT"] == "no") qconfigList += "QT_NO_SCRIPT";
if (dictionary["SCRIPTTOOLS"] == "no") qconfigList += "QT_NO_SCRIPTTOOLS";
if (dictionary["FREETYPE"] == "no") qconfigList += "QT_NO_FREETYPE"; if (dictionary["FREETYPE"] == "no") qconfigList += "QT_NO_FREETYPE";
if (dictionary["NATIVE_GESTURES"] == "no") qconfigList += "QT_NO_NATIVE_GESTURES"; if (dictionary["NATIVE_GESTURES"] == "no") qconfigList += "QT_NO_NATIVE_GESTURES";
@ -3182,24 +3016,7 @@ void Configure::displayConfig()
cout << "OpenVG support.............." << dictionary[ "OPENVG" ] << endl; cout << "OpenVG support.............." << dictionary[ "OPENVG" ] << endl;
cout << "OpenSSL support............." << dictionary[ "OPENSSL" ] << endl; cout << "OpenSSL support............." << dictionary[ "OPENSSL" ] << endl;
cout << "QtDBus support.............." << dictionary[ "DBUS" ] << endl; cout << "QtDBus support.............." << dictionary[ "DBUS" ] << endl;
cout << "QtXmlPatterns support......." << dictionary[ "XMLPATTERNS" ] << endl; cout << "Declarative debugging......." << dictionary[ "DECLARATIVE_DEBUG" ] << endl;
cout << "Phonon support.............." << dictionary[ "PHONON" ] << endl;
cout << "QtMultimedia support........" << dictionary[ "MULTIMEDIA" ] << endl;
{
QString webkit = dictionary[ "WEBKIT" ];
if (webkit == "debug")
webkit = "yes (debug)";
cout << "WebKit support.............." << webkit << endl;
}
{
QString declarative = dictionary[ "DECLARATIVE" ];
cout << "Declarative support........." << declarative << endl;
if (declarative == "yes")
cout << "Declarative debugging......." << dictionary[ "DECLARATIVE_DEBUG" ] << endl;
}
cout << "V8 support.................." << dictionary[ "V8" ] << endl;
cout << "QtScript support............" << dictionary[ "SCRIPT" ] << endl;
cout << "QtScriptTools support......." << dictionary[ "SCRIPTTOOLS" ] << endl;
cout << "DirectWrite support........." << dictionary[ "DIRECTWRITE" ] << endl << endl; cout << "DirectWrite support........." << dictionary[ "DIRECTWRITE" ] << endl << endl;
cout << "Third Party Libraries:" << endl; cout << "Third Party Libraries:" << endl;
@ -3252,9 +3069,6 @@ void Configure::displayConfig()
cout << "Signature..................." << dictionary[ "CE_SIGNATURE"] << endl << endl; cout << "Signature..................." << dictionary[ "CE_SIGNATURE"] << endl << endl;
} }
if (dictionary["ASSISTANT_WEBKIT"] == "yes")
cout << "Using WebKit as html rendering engine in Qt Assistant." << endl;
if (checkAvailability("INCREDIBUILD_XGE")) if (checkAvailability("INCREDIBUILD_XGE"))
cout << "Using IncrediBuild XGE......" << dictionary["INCREDIBUILD_XGE"] << endl; cout << "Using IncrediBuild XGE......" << dictionary["INCREDIBUILD_XGE"] << endl;
if (!qmakeDefines.isEmpty()) { if (!qmakeDefines.isEmpty()) {