MCL/sf/mw/qt: comparison configure

equal deleted inserted replaced

-:56cd8111b7f7
+:41300fa6a67c
 esac
 echo "$2" "$eq" "$3" >> "$QMAKE_VARS_FILE"
 }
+# Helper function for getQMakeConf. It parses include statements in
+# qmake.conf and prints out the expanded file
+getQMakeConf1()
+{
+while read line; do case "$line" in
+include*)
+	    inc_file=`echo "$line" | sed -n -e "/^include.*(.*)/s/include.*(\(.*\)).*$/\1/p"`
+	    current_dir=`dirname "$1"`
+	    conf_file="$current_dir/$inc_file"
+	    if [ ! -e  "$conf_file" ]; then
+echo "WARNING: Unable to find file $conf_file" >&2
+continue
+fi
+getQMakeConf1 "$conf_file"
+;;
+*)
+echo "$line"
+;;
+esac; done < "$1"
+}
 # relies on $QMAKESPEC being set correctly. parses include statements in
 # qmake.conf and prints out the expanded file
 getQMakeConf()
 {
 tmpSPEC="$QMAKESPEC"
 if [ -n "$1" ]; then
 tmpSPEC="$1"
 fi
-$AWK -v "QMAKESPEC=$tmpSPEC" '
+getQMakeConf1 "$tmpSPEC/qmake.conf"
-/^include\(.+\)$/{
-fname = QMAKESPEC "/" substr($0, 9, length($0) - 9)
-while ((getline line < fname) > 0)
-print line
-close(fname)
-next
-}
-{ print }' "$tmpSPEC/qmake.conf"
 }
 # relies on $TEST_COMPILER being set correctly
 compilerSupportsFlag()
 {
 cat >conftest.cpp <<EOF
 int main() { return 0; }
 EOF
-"$TEST_COMPILER" "$@" -o /dev/null conftest.cpp
+"$TEST_COMPILER" "$@" -o conftest.o conftest.cpp
 ret=$?
 rm -f conftest.cpp conftest.o
 return $ret
 }
 #-------------------------------------------------------------------------------
 COMMERCIAL_USER=ask
 CFG_DEV=no
 CFG_NOKIA=no
 CFG_EMBEDDED=no
+CFG_RTOS_ENABLED=yes
 EditionString=Commercial
 earlyArgParse()
 {
 # parse the arguments, setting things to "yes" or "no"
 QT_EDITION="QT_EDITION_DESKTOP"
 LicenseType="Technology Preview"
 elif [ $COMMERCIAL_USER = "yes" ]; then
 # one of commercial editions
 [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes
-[ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=yes
+[ "$PLATFORM_QWS" = "maybe" ] && PLATFORM_QWS=no
 # read in the license file
 if [ -f "$LICENSE_FILE" ]; then
 . "$LICENSE_FILE" >/dev/null 2>&1
 if [ -z "$LicenseKeyExt" ]; then
 echo
 echo "Invalid license key. Please check the license key."
 exit 1
 fi
 ProductCode=`echo $LicenseKeyExt | cut -f 1 -d - | cut -b 1`
-PlatformCode=`echo $LicenseKeyExt | cut -f 2 -d - | cut -b 1`
+PlatformCode=`echo $LicenseKeyExt | cut -f 2 -d -`
 LicenseTypeCode=`echo $LicenseKeyExt | cut -f 3 -d -`
 LicenseFeatureCode=`echo $LicenseKeyExt | cut -f 4 -d - | cut -b 1`
 # determine which edition we are licensed to use
 case "$LicenseTypeCode" in
 ;;
 esac
 ;;
 Z4M|R4M|Q4M)
 LicenseType="Evaluation"
+QMakeVar add DEFINES QT_EVAL
 case $ProductCode in
 B)
 Edition="Evaluation"
 QT_EDITION="QT_EDITION_EVALUATION"
 ;;
 exit 1
 fi
 # verify that we are licensed to use Qt on this platform
 LICENSE_EXTENSION=
-if [ "$PlatformCode" = "X" ]; then
+case "$PlatformCode" in
-	# Qt All-OS
+	*L)
-	LICENSE_EXTENSION="-ALLOS"
+	    CFG_RTOS_ENABLED=yes
-elif [ "$PLATFORM_QWS" = "yes" ]; then
+	    PlatformCode=`echo "$PlatformCode" | sed 'h;y/8NPQRTZ/UCWX9M7/;x;G;s/\(.\)....\(.\)./\1\2/'`
-case $PlatformCode in
+	    ;;
-2|4|8|A|B|E|G|J|K|P|Q|S|U|V|W)
+	*)
+	    CFG_RTOS_ENABLED=no
+	    PlatformCode=`echo "$PlatformCode" | sed 's/.$//'`
+	    ;;
+esac
+case "$PlatformCode,$PLATFORM_MAC,$PLATFORM_QWS" in
+X9,* | XC,* | XU,* | XW,* | XM,*)
+# Qt All-OS
+LICENSE_EXTENSION="-ALLOS"
+;;
+8M,* | KM,* | S9,* | SC,* | SU,* | SW,* | X9,* | XC,* | XU,* | XW,*)
 # Qt for Embedded Linux
 LICENSE_EXTENSION="-EMBEDDED"
 ;;
+6M,*,no | N7,*,no | N9,*,no | NX,*,no)
+# Embedded no-deploy
+LICENSE_EXTENSION="-EMBEDDED"
+;;
+FM,*,no | LM,yes,* | ZM,no,no)
+# Desktop
+LICENSE_EXTENSION="-DESKTOP"
+;;
 *)
+Platform=Linux/X11
+[ "$PLATFORM_MAC" = "yes" ] && Platform='Mac OS X'
+[ "$PLATFORM_QWS" = "yes" ] && Platform='Embedded Linux'
 echo
-echo "You are not licensed for Qt for Embedded Linux."
+echo "You are not licensed for the $Platform platform."
 echo
-echo "Please contact qt-info@nokia.com to upgrade your license"
+echo "Please contact qt-info@nokia.com to upgrade your license to"
-echo "to include Qt for Embedded Linux, or install the"
+echo "include the $Platform platform, or install the Qt Open Source Edition"
-echo "Qt Open Source Edition if you intend to develop free software."
+echo "if you intend to develop free software."
 exit 1
 ;;
 esac
-elif [ "$PLATFORM_MAC" = "yes" ]; then
-case $PlatformCode in
-2|4|5|7|9|B|C|E|F|G|L|M|U|W|Y)
-# Qt/Mac
-LICENSE_EXTENSION="-DESKTOP"
-;;
-3|6|8|A|D|H|J|K|P|Q|S|V)
-# Embedded no-deploy
-LICENSE_EXTENSION="-EMBEDDED"
-	    ;;
-*)
-echo
-echo "You are not licensed for the Qt/Mac platform."
-echo
-echo "Please contact qt-info@nokia.com to upgrade your license"
-echo "to include the Qt/Mac platform."
-exit 1
-;;
-esac
-else
-case $PlatformCode in
-2|3|4|5|7|D|E|F|J|M|Q|S|T|V|Z)
-# Qt/X11
-LICENSE_EXTENSION="-DESKTOP"
-;;
-6|8|9|A|B|C|G|H|K|P|U|W)
-# Embedded no-deploy
-LICENSE_EXTENSION="-EMBEDDED"
-;;
-*)
-echo
-echo "You are not licensed for the Qt/X11 platform."
-echo
-echo "Please contact qt-info@nokia.com to upgrade your license to"
-echo "include the Qt/X11 platform, or install the Qt Open Source Edition"
-echo "if you intend to develop free software."
-exit 1
-;;
-esac
-fi
 if test -r "$relpath/.LICENSE"; then
 	# Generic, non-final license
 	LICENSE_EXTENSION=""
 	line=`sed 'y/a-z/A-Z/;q' "$relpath"/.LICENSE`
 	EditionString="$Edition"
 	QT_EDITION="QT_EDITION_DESKTOP"
 fi
 case "$LicenseFeatureCode" in
-G|L)
+B|G|L|Y)
 # US
 case "$LicenseType" in
 Commercial)
 cp -f "$relpath/.LICENSE${LICENSE_EXTENSION}-US" "$outpath/LICENSE"
 ;;
 Evaluation)
 cp -f "$relpath/.LICENSE-EVALUATION-US" "$outpath/LICENSE"
 ;;
 esac
 ;;
-2|5)
+2|4|5|F)
 # non-US
 case "$LicenseType" in
 Commercial)
 cp -f "$relpath/.LICENSE${LICENSE_EXTENSION}" "$outpath/LICENSE"
 ;;
 *)
 echo
 echo "Invalid license key. Please check the license key."
 exit 1
 ;;
+esac
+case "$LicenseFeatureCode" in
+	4|B|F|Y)
+	    CFG_RTOS_ENABLED=yes
+	    ;;
+	2|5|G|L)
+	    CFG_RTOS_ENABLED=no
+	    ;;
 esac
 if [ '!' -f "$outpath/LICENSE" ]; then
 echo "The LICENSE, LICENSE.GPL3 LICENSE.LGPL file shipped with"
 echo "this software has disappeared."
 echo
 CFG_NOBUILD_PARTS=""
 CFG_RELEASE_QMAKE=no
 CFG_PHONON=auto
 CFG_PHONON_BACKEND=yes
 CFG_MULTIMEDIA=yes
+CFG_AUDIO_BACKEND=yes
 CFG_SVG=yes
+CFG_DECLARATIVE=auto
 CFG_WEBKIT=auto # (yes|no|auto)
 CFG_JAVASCRIPTCORE_JIT=auto
 CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen directfb"
 CFG_GFX_ON="linuxfb multiscreen"
 CFG_OPENSSL=auto
 CFG_PTMALLOC=no
 CFG_STL=auto
 CFG_PRECOMPILE=auto
 CFG_SEPARATE_DEBUG_INFO=auto
+CFG_SEPARATE_DEBUG_INFO_NOCOPY=no
 CFG_REDUCE_EXPORTS=auto
 CFG_MMX=auto
 CFG_3DNOW=auto
 CFG_SSE=auto
 CFG_SSE2=auto
 CFG_ENDIAN=auto
 CFG_HOST_ENDIAN=auto
 CFG_DOUBLEFORMAT=auto
 CFG_ARMFPA=auto
 CFG_IWMMXT=no
+CFG_NEON=auto
 CFG_CLOCK_GETTIME=auto
 CFG_CLOCK_MONOTONIC=auto
 CFG_MREMAP=auto
 CFG_GETADDRINFO=auto
 CFG_IPV6IFNAME=auto
 # flags for libdbus-1
 QT_CFLAGS_DBUS=
 QT_LIBS_DBUS=
+# QTP:QTPROD-7 Cross compiling on Linux broken
+# flags for Symbian style
+QT_SYMBIAN_STYLE_FLAGS=
 # flags for Glib (X11 only)
 QT_CFLAGS_GLIB=
 QT_LIBS_GLIB=
 # flags for GStreamer (X11 only)
 ;;
 --*)
 VAR=`echo $1 | sed "s,^--\(.*\),\1,"`
 VAL=yes
 ;;
+#QTP:QTPPROD-7
+#Qt Symbian style options
+-*-style-s60)
+VAR=`echo $1 | sed "s,^-[^-]*-\(.*\),\1,"`
+if [ "$1" = "-no-style-s60" ]; then
+VAL=no
+else
+VAL=yes
+fi
+;;
 #Qt plugin options
 -no-*-*|-plugin-*-*|-qt-*-*)
 VAR=`echo $1 | sed "s,^-[^-]*-\(.*\),\1,"`
 VAL=`echo $1 | sed "s,^-\([^-]*\).*,\1,"`
 ;;
 -no-*)
 VAR=`echo $1 | sed "s,^-no-\(.*\),\1,"`
 VAL=no
 ;;
 #Qt style yes options
--incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-svg|-webkit|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config)
+-incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-webkit|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config)
 VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
 VAL=yes
 ;;
 #Qt style options that pass an argument
 -qconfig)
 host_endian)
 if [ "$VAL" = "little" ]; then
 CFG_HOST_ENDIAN="Q_LITTLE_ENDIAN"
 elif [ "$VAL" = "big" ]; then
 CFG_HOST_ENDIAN="Q_BIG_ENDIAN"
+else
+UNKNOWN_OPT=yes
+fi
+;;
+#QTP: QTPPROD-7
+style-s60)
+if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+QT_SYMBIAN_STYLE_FLAGS="$VAL"
 else
 UNKNOWN_OPT=yes
 fi
 ;;
 armfpa)
 ;;
 esac
 ;;
 xplatform)
 XPLATFORM="$VAL"
+# QTP:QTPROD-7 Cross compiling on Linux broken
+if [ "$CFG_ENDIAN" = "auto" ] && [ "$XPLATFORM"="symbian-sbsv2" ]; then
+echo "set endian byte order"
+CFG_ENDIAN="Q_LITTLE_ENDIAN"
+fi
 ;;
 debug-and-release)
 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
 CFG_DEBUG_RELEASE="$VAL"
 else
 fi
 ;;
 separate-debug-info)
 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
 CFG_SEPARATE_DEBUG_INFO="$VAL"
+elif [ "$VAL" = "nocopy" ] ; then
+CFG_SEPARATE_DEBUG_INFO="yes"
+CFG_SEPARATE_DEBUG_INFO_NOCOPY="yes"
 else
 UNKNOWN_OPT=yes
 fi
 ;;
 reduce-exports)
 fi
 ;;
 iwmmxt)
 	CFG_IWMMXT="yes"
 	;;
+neon)
+if [ "$VAL" = "no" ]; then
+CFG_NEON="$VAL"
+else
+UNKNOWN_OPT=yes
+fi
+;;
 reduce-relocations)
 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
 CFG_REDUCE_RELOCATIONS="$VAL"
 else
 UNKNOWN_OPT=yes
 if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then
 CFG_SVG="yes"
 else
 if [ "$VAL" = "no" ]; then
 CFG_SVG="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
 	;;
 CFG_MULTIMEDIA="$VAL"
 else
 UNKNOWN_OPT=yes
 fi
 ;;
+audio-backend)
+if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+CFG_AUDIO_BACKEND="$VAL"
+else
+UNKNOWN_OPT=yes
+fi
+;;
 *)
 UNKNOWN_OPT=yes
 ;;
 esac
 if [ "$UNKNOWN_OPT" = "yes" ]; then
 OPT_SHADOW=yes
 fi
 fi
 fi
 if [ "$OPT_SHADOW" = "yes" ]; then
-if [ -f "$relpath/.qmake.cache" -o -f "$relpath/src/corelib/global/qconfig.h" ]; then
+if [ -f "$relpath/.qmake.cache" -o -f "$relpath/src/corelib/global/qconfig.h" -o -f "$relpath/src/corelib/global/qconfig.cpp" ]; then
 echo >&2 "You cannot make a shadow build from a source tree containing a previous build."
 echo >&2 "Cannot proceed."
 exit 1
 fi
 [ "$OPT_VERBOSE" = "yes" ] && echo "Performing shadow build..."
 echo "The two architectures you have specified are different, so we can"
 echo "not proceed. Either set both to be the same, or only use -embedded."
 echo ""
 exit 1
 fi
+fi
+if [ "$CFG_RTOS_ENABLED" = "no" ]; then
+case `basename "$XPLATFORM"` in
+	qnx-* | vxworks-*)
+echo ""
+echo "You are not licensed for Qt for `basename $XPLATFORM`."
+echo ""
+echo "Please contact qt-info@nokia.com to upgrade your license to"
+echo "include this platform, or install the Qt Open Source Edition"
+echo "if you intend to develop free software."
+exit 1
+	    ;;
+esac
 fi
 if [ -z "${CFG_HOST_ARCH}" ]; then
 case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in
 IRIX*:*:*)
 echo >&2 "the paths to the toolchain's libraries & headers. If configure"
 echo >&2 "tests are failing, please check these files."
 echo >&2 ""
 fi
 else
+echo >&2 ""
+echo >&2 "You have not explicitly asked to use pkg-config and are cross-compiling."
+echo >&2 "pkg-config will not be used to automatically query cflag/lib parameters for"
+echo >&2 "dependencies"
+echo >&2 ""
 PKG_CONFIG=""
 fi
 fi
 # process CFG_MAC_ARCHS
 done
 fi
 # pass on $CFG_SDK to the configure tests.
 if [ '!' -z "$CFG_SDK" ]; then
-MAC_CONFIG_TEST_COMMANDLINE="-sdk $CFG_SDK"
+MAC_CONFIG_TEST_COMMANDLINE="$MAC_CONFIG_TEST_COMMANDLINE -sdk $CFG_SDK"
 fi
 # find the default framework value
 if [ "$PLATFORM_MAC" = "yes" ] && [ "$PLATFORM" != "macx-xlc" ]; then
 if [ "$CFG_FRAMEWORK" = "auto" ]; then
 fi
 QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1`
 TEST_COMPILER="$CC"
 [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
+if [ -z "$TEST_COMPILER" ]; then
+echo "ERROR: Cannot set the compiler for the configuration tests"
+exit 1
+fi
 # auto-detect precompiled header support
 if [ "$CFG_PRECOMPILE" = "auto" ]; then
 if [ `echo "$CFG_MAC_ARCHS" | wc -w` -gt 1 ]; then
 CFG_PRECOMPILE=no
 	echo
 CFG_FRAMEWORK="no"
 fi
 else
 CFG_FRAMEWORK=no
+fi
+# Print a warning if configure was called with the 10.4u SDK option on Snow Leopard
+# with the default mkspec. The 10.4u SDK does not support gcc 4.2.
+if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then
+# get the darwin version. 10.0.0 and up means snow leopard.
+VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
+if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" == "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" == "macx-g++" ]; then
+echo
+echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. "
+echo
+fi
 fi
 # x11 tests are done after qmake is built
 [-plugin-sql-<driver>] [-system-sqlite] [-no-qt3support] [-qt3support]
 [-platform] [-D <string>] [-I <string>] [-L <string>] [-help]
 [-qt-zlib] [-system-zlib] [-no-gif] [-qt-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>]
-[-no-make <part>] [-R <string>]  [-l <string>] [-no-rpath]  [-rpath] [-continue]
+[-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-separate-debug-info] [-no-mmx] [-no-3dnow] [-no-sse] [-no-sse2]
 [-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-openssl] [-openssl] [-openssl-linked]
+[-no-audio-backend] [-audio-backend] [-no-openssl] [-openssl] [-openssl-linked]
 [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit] [-no-javascript-jit] [-javascript-jit]
-[-no-script] [-script] [-no-scripttools] [-scripttools]
+[-no-script] [-script] [-no-scripttools] [-scripttools] [-no-declarative] [-declarative]
 [additional platform specific options (see below)]
 Installation options:
 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-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-declarative .....Do not build the declarative module.
+-declarative ....... Build the declarative module.
 -platform target ... The operating system and compiler you are building
 on ($PLATFORM).
 See the README file for a list of supported
 See http://radscan.com/nas.html
 -no-opengl ......... Do not support OpenGL.
 +  -opengl <api> ...... Enable OpenGL support.
 With no parameter, this will auto-detect the "best"
-OpenGL API to use. If desktop OpenGL is avaliable, it
+OpenGL API to use. If desktop OpenGL is available, it
 will be used. Use desktop, es1, es1cl or es2 for <api>
 to force the use of the Desktop (OpenGL 1.x or 2.x),
 OpenGL ES 1.x Common profile, 1.x Common Lite profile
 or 2.x APIs instead. On X11, the EGL API will be used
 to manage GL contexts in the case of OpenGL ES
 Possible values for <driver>: [ $CFG_MOUSE_AVAILABLE ]
 -iwmmxt ............ Compile using the iWMMXt instruction set
 (available on some XScale CPUs).
+-no-neon ........... Do not compile with use of NEON instructions.
 EOF
 fi
 if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_X11" = "yes" ]; then
 $GBY  -glib .............. Compile Glib support.
 EOF
 fi
+# QTP:QTPROD-7 Cross compiling on Linux broken
+if [ "$XPLATFORM" = "symbian-sbsv2" ]; then
+cat << EOF
+Qt for Symbian only:
+-no-style-s60....... Disable s60 entirely
+-qt-style-s60....... Enable s60 in the Qt Library
+EOF
+fi
 [ "x$ERROR" = "xyes" ] && exit 1
 exit 0
 fi # Help
 # -----------------------------------------------------------------------------
 # LICENSING, INTERACTIVE PART
 # -----------------------------------------------------------------------------
 if [ "$PLATFORM_QWS" = "yes" ]; then
 Platform="Qt for Embedded Linux"
 elif [ "$PLATFORM_MAC" = "yes" ]; then
 Platform="Qt/Mac"
+elif [ "$XPLATFORM" = "symbian-sbsv2" ]; then
+Platform="Qt/Symbian"
 else
 PLATFORM_X11=yes
-Platform="Qt/X11"
+Platform="Qt for Linux/X11"
 fi
 echo
 echo "This is the $Platform ${EditionString} Edition."
 echo
 TRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_INSTALL_TRANSLATIONS"`
 SETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"`
 EXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"`
 DEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"`
+TODAY=`date +%Y-%m-%d`
 cat > "$outpath/src/corelib/global/qconfig.cpp.new" <<EOF
 /* License Info */
 static const char qt_configure_licensee_str          [256 + 12] = "$LICENSE_USER_STR";
 static const char qt_configure_licensed_products_str [256 + 12] = "$LICENSE_PRODUCTS_STR";
+/* Installation date */
+static const char qt_configure_installation          [12+11]    = "qt_instdate=$TODAY";
 EOF
 if [ ! -z "$QT_HOST_PREFIX" ]; then
 HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX"`
 HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"`
 HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"`
 else
 [ -f "$outpath/src/corelib/global/qconfig.cpp" ] && chmod +w "$outpath/src/corelib/global/qconfig.cpp"
 mv "$outpath/src/corelib/global/qconfig.cpp.new" "$outpath/src/corelib/global/qconfig.cpp"
 chmod -w "$outpath/src/corelib/global/qconfig.cpp"
 fi
+# -----------------------------------------------------------------------------
+if [ "$LicenseType" = "Evaluation" ]; then
+EVALKEY=`"$relpath/config.tests/unix/padstring" 524 "qt_qevalkey=$LicenseKeyExt"`
+elif echo "$D_FLAGS" | grep QT_EVAL >/dev/null 2>&1; then
+EVALKEY=`"$relpath/config.tests/unix/padstring" 524 "qt_qevalkey="`
+fi
+if [ -n "$EVALKEY" ]; then
+rm -f "$outpath/src/corelib/global/qconfig_eval.cpp"
+cat > "$outpath/src/corelib/global/qconfig_eval.cpp" <<EOF
+/* Evaluation license key */
+static const char qt_eval_key_data                   [512 + 12] = "$EVALKEY";
+EOF
+chmod -w "$outpath/src/corelib/global/qconfig_eval.cpp"
+fi
 # -----------------------------------------------------------------------------
 # build qmake
 # -----------------------------------------------------------------------------
 "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/iwmmxt "iwmmxt" $L_FLAGS $I_FLAGS $l_FLAGS "-mcpu=iwmmxt"
 if [ $? != "0" ]; then
 echo "The iWMMXt functionality test failed!"
 	echo " Please make sure your compiler supports iWMMXt intrinsics!"
 	exit 1
+fi
+fi
+# detect neon support
+if ([ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]) && [ "${CFG_NEON}" = "auto" ]; then
+if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/neon "neon" $L_FLAGS $I_FLAGS $l_FLAGS "-mfpu=neon"; then
+	CFG_NEON=yes
+else
+	CFG_NEON=no
 fi
 fi
 # detect zlib
 if [ "$CFG_ZLIB" = "no" ]; then
 fi
 fi
 fi
 # detect OpenVG support
-if [ "$CFG_OPENVG" != "no" ]; then
+#QTP:QTPPROD-7 It is necessary to prohibit OpenVg checking for Symbian build
+echo $XQMAKESPEC
+if [ "$CFG_OPENVG" != "no" ] && [ "$XPLATFORM" != "symbian-sbsv2" ]; 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
 if [ "$CFG_OPENVG" = "auto" ]; then
 CFG_OPENVG=yes
 fi
 elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG openvg_on_opengl" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/openvg" "OpenVG" $L_FLAGS $I_FLAGS $l_FLAGS $CONFIG_ARG; then
 if [ "$CFG_ALSA" = "auto" ]; then
 if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/alsa "alsa" $L_FLAGS $I_FLAGS $l_FLAGS; then
 CFG_ALSA=yes
 else
 CFG_ALSA=no
+fi
+fi
+if [ -f "$relpath/src/declarative/declarative.pro" ]; then
+if [ "$CFG_DECLARATIVE" = "auto" ]; then
+CFG_DECLARATIVE=yes
+fi
+else
+if [ "$CFG_DECLARATIVE" = "auto" ] || [ "$CFG_DECLARATIVE" = "no" ]; then
+CFG_DECLARATIVE=no
+else
+echo "Error: Unable to locate the qt-declarative package. Refer to the documentation on how to build the package."
+exit 1
 fi
 fi
 if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ] || [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then
 if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then
 QT_CONFIG="$QT_CONFIG shivavg"
 QCONFIG_FLAGS="$QCONFIG_FLAGS QT_SHIVAVG"
 fi
 fi
+# QTP:QTPROD-7 Cross compiling on Linux broken
+if [ "$QT_SYMBIAN_STYLE_FLAGS" = "no" ]; then
+QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_S60"
+else
+QCONFIG_FLAGS="$QCONFIG_FLAGS QT_STYLE_S60"
+fi
 # enable opengl
 if [ "$CFG_OPENGL" = "no" ]; then
 QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENGL"
 else
 QT_CONFIG="$QT_CONFIG opengl"
 if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then
 QMakeVar add QMAKE_CFLAGS -g
 QMakeVar add QMAKE_CXXFLAGS -g
 QMAKE_CONFIG="$QMAKE_CONFIG separate_debug_info"
 fi
+if [ "$CFG_SEPARATE_DEBUG_INFO_NOCOPY" = "yes" ] ; then
+QMAKE_CONFIG="$QMAKE_CONFIG separate_debug_info_nocopy"
+fi
 [ "$CFG_MMX" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG mmx"
 [ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow"
 [ "$CFG_SSE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse"
 [ "$CFG_SSE2" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG sse2"
 [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt"
+[ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon"
 [ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS"
 if [ "$CFG_IPV6" = "yes" ]; then
 QT_CONFIG="$QT_CONFIG ipv6"
 fi
 if [ "$CFG_CLOCK_GETTIME" = "yes" ]; then
 QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MULTIMEDIA"
 else
 QT_CONFIG="$QT_CONFIG multimedia"
 fi
+if [ "$CFG_AUDIO_BACKEND" = "yes" ]; then
+QT_CONFIG="$QT_CONFIG audio-backend"
+fi
 if [ "$CFG_SVG" = "yes" ]; then
 QT_CONFIG="$QT_CONFIG svg"
 else
 QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SVG"
+fi
+if [ "$CFG_DECLARATIVE" = "yes" ]; then
+QT_CONFIG="$QT_CONFIG declarative"
+else
+QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DECLARATIVE"
 fi
 if [ "$CFG_WEBKIT" = "auto" ]; then
 CFG_WEBKIT="$canBuildWebKit"
 fi
 echo "JavaScriptCore JIT .. To be decided by JavaScriptCore"
 else
 echo "JavaScriptCore JIT .. $CFG_JAVASCRIPTCORE_JIT"
 fi
 fi
+echo "Declarative module .. $CFG_DECLARATIVE"
 echo "STL support ......... $CFG_STL"
 echo "PCH support ......... $CFG_PRECOMPILE"
 echo "MMX/3DNOW/SSE/SSE2..  ${CFG_MMX}/${CFG_3DNOW}/${CFG_SSE}/${CFG_SSE2}"
-if [ "${CFG_ARCH}" = "arm" ]; then
+if [ "$CFG_ARCH" = "arm" ] || [ "$CFG_ARCH" = "armv6" ]; then
 echo "iWMMXt support ...... ${CFG_IWMMXT}"
+echo "NEON support ........ ${CFG_NEON}"
 fi
 [ "${PLATFORM_QWS}" != "yes" ] && echo "Graphics System ..... $CFG_GRAPHICS_SYSTEM"
 echo "IPv6 support ........ $CFG_IPV6"
 echo "IPv6 ifname support . $CFG_IPV6IFNAME"
 echo "getaddrinfo support . $CFG_GETADDRINFO"
 /^(TARGET.*=)/ {
 if ( \$3 == "moc" || \$3 ~ /^Qt/ ) {
 target_file = first
 matched_target = 1
+} else if ( \$3 == "lrelease" || \$3 == "qm_phony_target" ) {
+target_file = second
+matched_target = 1
 }
 }
 matched_target == 0 && /^(TEMPLATE.*=)/ {
 if ( \$3 == "subdirs" )
 PART_ROOTS=
 for part in $CFG_BUILD_PARTS; do
 case "$part" in
 tools) PART_ROOTS="$PART_ROOTS tools" ;;
 libs) PART_ROOTS="$PART_ROOTS src" ;;
+translations) PART_ROOTS="$PART_ROOTS tools/linguist/lrelease translations" ;;
 examples) PART_ROOTS="$PART_ROOTS examples demos" ;;
 *) ;;
 esac
 done
 case $a in
 *winmain/winmain.pro) continue ;;
 *s60main/s60main.pro) continue ;;
 *examples/activeqt/*) continue ;;
 */qmake/qmake.pro) continue ;;
-*tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*) SPEC=$QMAKESPEC ;;
+*tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*|*linguist/lrelease*) SPEC=$QMAKESPEC ;;
 *) SPEC=$XQMAKESPEC ;;
 esac
 dir=`dirname "$a" | sed -e "s;$sepath;.;g"`
 test -d "$dir" || mkdir -p "$dir"
 OUTDIR="$outpath/$dir"

changeset 3	41300fa6a67c
parent 0	1918ee327afb
child 4	3b1da2848fc7