FCL/sf/mw/qt: comparison configure

equal deleted inserted replaced

-:ef0373b55136
+:758a864f9613
 OPT_FAST=auto
 OPT_VERBOSE=no
 OPT_HELP=
 CFG_SILENT=no
 CFG_GRAPHICS_SYSTEM=default
+CFG_RUNTIME_SYSTEM=
 CFG_ALSA=auto
 CFG_PULSEAUDIO=auto
 CFG_COREWLAN=auto
 CFG_ICD=auto
 CFG_NOPROCESS=no
 QT_LFLAGS_MYSQL=
 QT_LFLAGS_MYSQL_R=
 QT_CFLAGS_SQLITE=
 QT_LFLAGS_SQLITE=
 QT_LFLAGS_ODBC="-lodbc"
+QT_LFLAGS_TDS=
 # flags for libdbus-1
 QT_CFLAGS_DBUS=
 QT_LIBS_DBUS=
 # flags for GStreamer (X11 only)
 QT_CFLAGS_GSTREAMER=
 QT_LIBS_GSTREAMER=
-# flags for icd (Maemo Internet Connection Daemon)
+# flags for libconnsettings0 (used for Maemo ICD bearer management plugin)
-QT_CFLAGS_ICD=
+QT_CFLAGS_CONNSETTINGS=
-QT_LIBS_ICD=
+QT_LIBS_CONNSETTINGS=
 #-------------------------------------------------------------------------------
 # check SQL drivers, mouse drivers and decorations available in this package
 #-------------------------------------------------------------------------------
 -graphicssystem)
 	VAR="graphicssystem"
 	shift
 	VAL=$1
 	;;
+-runtimegraphicssystem)
+	VAR="runtimegraphicssystem"
+	shift
+	VAL=$1
+	;;
 -qtlibinfix)
 VAR="qtlibinfix"
 shift
 VAL="$1"
 ;;
 CFG_GRAPHICS_SYSTEM="opengl"
 elif [ "$VAL" = "openvg" ]; then
 CFG_GRAPHICS_SYSTEM="openvg"
 elif [ "$VAL" = "raster" ]; then
 CFG_GRAPHICS_SYSTEM="raster"
+elif [ "$VAL" = "runtime" ]; then
+CFG_GRAPHICS_SYSTEM="runtime"
 else
 UNKNOWN_OPT=yes
 fi
+fi
+	;;
+runtimegraphicssystem)
+if  [ "$VAL" != "runtime" ]; then
+CFG_RUNTIME_SYSTEM="$VAL"
 fi
 	;;
 qvfb) # left for commandline compatibility, not documented
 if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
 if [ "$OPT" = "plugin" ] || [ "$OPT" = "qt" ]; then
 if [ "$OPT" = "plugin" ]; then
 [ "$VAR" = "decoration" ] && QMakeVar del "${VAR}s" "$VAL"
 [ "$VAR" = "decoration" ] && CFG_DECORATION_ON=`echo "${CFG_DECORATION_ON} " | sed "s,${VAL} ,,g"` && CFG_DECORATION_PLUGIN="$CFG_DECORATION_PLUGIN ${VAL}"
 [ "$VAR" = "kbd" ] && QMakeVar del "${VAR}s" "$VAL"
-[ "$VAR" = "kbd" ] && CFG_KBD_ON=`echo "${CFG_MOUSE_ON} " | sed "s,${VAL} ,,g"` && CFG_KBD_PLUGIN="$CFG_KBD_PLUGIN ${VAL}"
+[ "$VAR" = "kbd" ] && CFG_KBD_ON=`echo "${CFG_KBD_ON} " | sed "s,${VAL} ,,g"` && CFG_KBD_PLUGIN="$CFG_KBD_PLUGIN ${VAL}"
 [ "$VAR" = "mouse" ] && QMakeVar del "${VAR}s" "$VAL"
 [ "$VAR" = "mouse" ] && CFG_MOUSE_ON=`echo "${CFG_MOUSE_ON} " | sed "s,${VAL} ,,g"` && CFG_MOUSE_PLUGIN="$CFG_MOUSE_PLUGIN ${VAL}"
 [ "$VAR" = "gfx" ] && QMakeVar del "${VAR}s" "$VAL"
 [ "$VAR" = "gfx" ] && CFG_GFX_ON=`echo "${CFG_GFX_ON} " | sed "s,${VAL} ,,g"` && CFG_GFX_PLUGIN="${CFG_GFX_PLUGIN} ${VAL}"
 VAR="${VAR}-${OPT}"
 echo
 fi
 # detect build style
 if [ "$CFG_DEBUG" = "auto" ]; then
-if [ "$PLATFORM_MAC" = "yes" ]; then
+if [ "$PLATFORM_MAC" = "yes" -o "$XPLATFORM_MINGW" = "yes" ]; then
 CFG_DEBUG_RELEASE=yes
 CFG_DEBUG=yes
 elif [ "$CFG_DEV" = "yes" ]; then
 CFG_DEBUG_RELEASE=no
 CFG_DEBUG=yes
 fi
 done
 # symlink the mkspecs directory
 mkdir -p "$outpath/mkspecs"
-rm -f "$outpath"/mkspecs/*
+rm -rf "$outpath"/mkspecs/*
 ln -s "$relpath"/mkspecs/* "$outpath/mkspecs"
 rm -f "$outpath/mkspecs/default"
+ShadowMkspecs()
+{
+rm -rf "$outpath/mkspecs/$1"
+if [ "$UNAME_SYSTEM" = "Linux" ]; then
+# This works with GNU coreutils, and is needed for ScratchBox
+cp -rs "$relpath/mkspecs/$1" "$outpath/mkspecs/$1"
+else
+# A simple "cp -rs" doesn't work on Mac. :(
+find "$relpath/mkspecs/$1" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p
+find "$relpath/mkspecs/$1" -type f | sed "s,^$relpath/,," | xargs -n 1 -I % ln -s "$relpath/%" "$outpath/%"
+fi
+}
+# Special case for mkspecs/features directory.
+# To be able to place .prf files into a shadow build directory,
+# we're creating links for files only. The directory structure is reproduced.
+ShadowMkspecs features
+# The modules dir is special, too.
+ShadowMkspecs modules
 # symlink the doc directory
 rm -rf "$outpath/doc"
 ln -s "$relpath/doc" "$outpath/doc"
 +  -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.
+-no-declarative .....Do not build the declarative module.
--declarative ....... 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
 if [ "${PLATFORM_QWS}" != "yes" ]; then
 cat << EOF
 -graphicssystem <sys> Sets an alternate graphics system. Available options are:
 raster - Software rasterizer
 opengl - Rendering via OpenGL, Experimental!
+openvg - Rendering via OpenVG, Experimental!
 EOF
 fi
 cat << EOF
 -no-mmx ............ Do not compile with use of MMX instructions.
 if test ! -d "$EPOCROOT/epoc32"; then
 echo "Could not find the 'epoc32' dir in your EPOCROOT."
 exit 1
 fi
-# the main commands needed to compile;
-(cd config.tests/symbian
-mkdir -p rcomp
-cd rcomp
-rm -f rcomp_test.rsg
-touch rcomp_test.rpp rcomp_test.rsc rcomp_test.rss
-rcomp -u -m045,046,047 -s./rcomp_test.rpp -o./rcomp_test.rsc -h./rcomp_test.rsg -i./rcomp_test.rss 2>&1 > /dev/null
-if test ! -f rcomp_test.rsg; then
-echo "Finding a working rcomp in your PATH failed."
-echo "Fatal error. Make sure you have the epoc tools working and in your PATH";
-exit 1;
-fi
-)
-# compile a simple main that uses printf
 if ! echo $XPLATFORM | grep symbian-sbsv2 > /dev/null; then
 # Raptor does not support configure tests.
+# the main commands needed to compile;
+(cd config.tests/symbian
+mkdir -p rcomp
+cd rcomp
+rm -f rcomp_test.rsg
+touch rcomp_test.rpp rcomp_test.rsc rcomp_test.rss
+rcomp -u -m045,046,047 -s./rcomp_test.rpp -o./rcomp_test.rsc -h./rcomp_test.rsg -i./rcomp_test.rss 2>&1 > /dev/null
+if test ! -f rcomp_test.rsg; then
+echo "Finding a working rcomp in your PATH failed."
+echo "Fatal error. Make sure you have the epoc tools working and in your PATH";
+exit 1;
+fi
+)
+# compile a simple main that uses printf
 if ! "$symbiantests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/symbian/simple "simple" $L_FLAGS $I_FLAGS $l_FLAGS
 then
 echo "Testing your compiler failed. Could not compile a simple application."
 echo "Fatal error; Rerun configure with -verbose to get more details."
 exit 1;
 fi
 fi
 ;;
 tds)
 if [ "$CFG_SQL_tds" != "no" ]; then
-if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
+[ -z "$SYBASE" ] || QT_LFLAGS_TDS="-L$SYBASE/lib"
+[ -z "$SYBASE_LIBS" ] || QT_LFLAGS_TDS="$QT_LFLAGS_TDS $SYBASE_LIBS"
+if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $QT_LFLAGS_TDS $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
 if [ "$CFG_SQL_tds" = "auto" ]; then
 CFG_SQL_tds=plugin
 fi
 else
 if [ "$CFG_SQL_tds" != "auto" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
 echo " You might need to either enable the GUI or disable Phonon"
 exit 1
 fi
 fi
-# Auto-detect GStreamer support (needed for both Phonon & QtMultimedia)
+# 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
 fi
 # auto-detect icd support
 if [ "$CFG_GLIB" = "yes" -a "$CFG_ICD" != "no" ]; then
-# ICD support has a cyclic dependency on Qt.
 if [ -n "$PKG_CONFIG" ]; then
-QT_CFLAGS_ICD=`$PKG_CONFIG --cflags osso-ic conninet 2>/dev/null`
+QT_CFLAGS_CONNSETTINGS=`$PKG_CONFIG --cflags connsettings 2>/dev/null`
-QT_LIBS_ICD=`$PKG_CONFIG --libs osso-ic conninet 2>/dev/null`
+QT_LIBS_CONNSETTINGS=`$PKG_CONFIG --libs connsettings 2>/dev/null`
-QT_CFLAGS_QTNETWORK=`$PKG_CONFIG --cflags QtNetwork 2>/dev/null`
+fi
-QT_LIBS_QTNETWORK=`$PKG_CONFIG --libs QtNetwork 2>/dev/null`
+if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/icd "ICD" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_CONNSETTINGS $QT_LIBS_CONNSETTINGS; then
-else
-QT_CFLAGS_QTNETWORK=
-QT_LIBS_QTNETWORK=
-fi
-if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/icd "ICD" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_ICD $QT_LIBS_ICD $QT_CFLAGS_QTNETWORK $QT_LIBS_QTNETWORK; then
 [ "$CFG_ICD" = "auto" ] && CFG_ICD=yes
-# remove system Qt includes and libraries
+QMakeVar set QT_CFLAGS_CONNSETTINGS "$QT_CFLAGS_CONNSETTINGS"
-QT_CFLAGS_ICD_TRIMMED=
+QMakeVar set QT_LIBS_CONNSETTINGS "$QT_LIBS_CONNSETTINGS"
-for i in $QT_CFLAGS_ICD; do
-case $i in
-*qt*)
-;;
-*)
-QT_CFLAGS_ICD_TRIMMED="$QT_CFLAGS_ICD_TRIMMED $i"
-;;
-esac
-done
-QT_LIBS_ICD_TRIMMED=
-for i in $QT_LIBS_ICD; do
-case $i in
-*qt*|-lQt*)
-;;
-*)
-QT_LIBS_ICD_TRIMMED="$QT_LIBS_ICD_TRIMMED $i"
-;;
-esac
-done
-QMakeVar set QT_CFLAGS_ICD "$QT_CFLAGS_ICD_TRIMMED"
-QMakeVar set QT_LIBS_ICD "$QT_LIBS_ICD_TRIMMED"
 else
 if [ "$CFG_ICD" = "auto" ]; then
 CFG_ICD=no
 elif [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
 # CFG_ICD is "yes"
-echo "The ICD Bearer Management plugin cannot be enabled because osso-ic or conninet was not found."
+echo "The ICD Bearer Management plugin cannot be enabled because connsettings was not found."
 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
 fi
 fi
 fi
 # find if the platform supports IPv6
 if [ "$CFG_IPV6" != "no" ]; then
-if [ "$XPLATFORM" = "symbian-sbsv2" ]; then
+#
-#IPV6 should always be enabled for Symbian release
+# We accidently enabled IPv6 for Qt Symbian in 4.6.x. However the underlying OpenC does not fully support IPV6.
-CFG_IPV6=yes
+# Therefore for 4.7.1 and following we disable it until OpenC either supports it or we have the native Qt
+# symbian socket engine.
+#
+if echo "$XPLATFORM" | grep symbian > /dev/null; then
+CFG_IPV6=no
 elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/ipv6 "IPv6" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then
 CFG_IPV6=yes
 else
 if [ "$CFG_IPV6" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then
 echo "IPv6 support cannot be enabled due to functionality tests!"
 # if openvg is disabled and the user specified graphicssystem vg, disable it...
 if [ "$CFG_GRAPHICS_SYSTEM" = "openvg" ] && [ "$CFG_OPENVG" = "no" ]; then
 echo "OpenVG Graphics System is disabled due to missing OpenVG support..."
 CFG_GRAPHICS_SYSTEM=default
+fi
+if [ -n "$CFG_RUNTIME_SYSTEM" -a "$CFG_GRAPHICS_SYSTEM" != "runtime" ] || [ "$CFG_RUNTIME_SYSTEM" = "runtime" ]; then
+echo "Argument to -runtimegraphicssystem is invalid so ignoring..."
+CFG_RUNTIME_SYSTEM=
 fi
 if [ "$CFG_PTMALLOC" != "no" ]; then
 # build ptmalloc, copy .a file to lib/
 echo "Building ptmalloc. Please wait..."
 QMAKE_OUTDIR="${QMAKE_OUTDIR}-emb-$CFG_EMBEDDED"
 QMAKE_CONFIG="$QMAKE_CONFIG embedded"
 QT_CONFIG="$QT_CONFIG embedded"
 rm -f "src/.moc/$QMAKE_OUTDIR/allmoc.cpp" # needs remaking if config changes
 fi
-QMakeVar set PRECOMPILED_DIR ".pch/$QMAKE_OUTDIR"
+if [ "$XPLATFORM_MINGW" != "yes" ]; then
+# Do not set this here for Windows. Let qmake do it so
+# debug and release precompiled headers are kept separate.
+QMakeVar set PRECOMPILED_DIR ".pch/$QMAKE_OUTDIR"
+fi
 QMakeVar set OBJECTS_DIR ".obj/$QMAKE_OUTDIR"
 QMakeVar set MOC_DIR ".moc/$QMAKE_OUTDIR"
 QMakeVar set RCC_DIR ".rcc/$QMAKE_OUTDIR"
 QMakeVar set UI_DIR ".uic/$QMAKE_OUTDIR"
 if [ "$CFG_LARGEFILE" = "yes" ] && [ "$XPLATFORM_MINGW" != "yes" ]; then
 fi
 # turn off exceptions for the compilers that support it
 if [ "$PLATFORM_QWS" = "yes" ]; then
 COMPILER=`echo $XPLATFORM | cut -f 3- -d-`
+elif [ "$XPLATFORM" != "$PLATFORM" ]; then
+COMPILER=`echo $XPLATFORM | cut -f 2- -d-`
 else
 COMPILER=`echo $PLATFORM | cut -f 2- -d-`
 fi
 if [ "$CFG_EXCEPTIONS" = "unspecified" -a "$PLATFORM_QWS" = "yes" ]; then
 CFG_EXCEPTIONS=no
 if [ "$CFG_WEBKIT" = "auto" ]; then
 CFG_WEBKIT="$canBuildWebKit"
 fi
 if [ "$CFG_WEBKIT" = "yes" ]; then
-QT_CONFIG="$QT_CONFIG webkit"
+# This include takes care of adding "webkit" to QT_CONFIG.
+cp -f "$relpath/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri" "$outpath/mkspecs/modules/qt_webkit_version.pri"
 # The reason we set CFG_WEBKIT, is such that the printed overview of what will be enabled, shows correctly.
 CFG_WEBKIT="yes"
 else
 CFG_WEBKIT="no"
 QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_WEBKIT"
 # generate QT_BUILD_KEY
 #-------------------------------------------------------------------------------
 # some compilers generate binary incompatible code between different versions,
 # so we need to generate a build key that is different between these compilers
+COMPAT_COMPILER=
 case "$COMPILER" in
 g++*)
 # GNU C++
 COMPILER_VERSION=`${QMAKE_CONF_COMPILER} -dumpversion 2>/dev/null`
 ;;
 *)
 ;;
 esac
 [ '!' -z "$COMPILER_VERSION" ] && COMPILER="g++-${COMPILER_VERSION}"
+;;
+icc*)
+# The Intel CC compiler on Unix systems matches the ABI of the g++
+# that is found on PATH
+COMPILER="icc"
+COMPAT_COMPILER="g++-4"
+case "`g++ -dumpversion` 2>/dev/null" in
+2.95.*)
+COMPAT_COMPILER="g++-2.95.*"
+;;
+3.*)
+COMPAT_COMPILER="g++-3.*"
+;;
+*)
+;;
+esac
 ;;
 *)
 #
 ;;
 esac
 rm -f .options
 BUILD_OPTIONS="$BUILD_CONFIG $BUILD_OPTIONS"
 # extract the operating system from the XPLATFORM
 TARGET_OPERATING_SYSTEM=`echo $XPLATFORM | cut -f 2- -d/ | cut -f -1 -d-`
+case "$XPLATFORM" in
+symbian*)
+QT_BUILD_KEY_SYSTEM_PART="Symbian"
+;;
+*)
+QT_BUILD_KEY_SYSTEM_PART="$CFG_ARCH $TARGET_OPERATING_SYSTEM $COMPILER"
+;;
+esac
 # when cross-compiling, don't include build-host information (build key is target specific)
-QT_BUILD_KEY="$CFG_USER_BUILD_KEY $CFG_ARCH $TARGET_OPERATING_SYSTEM $COMPILER $BUILD_OPTIONS"
+QT_BUILD_KEY="$CFG_USER_BUILD_KEY $QT_BUILD_KEY_SYSTEM_PART $BUILD_OPTIONS"
 if [ -n "$QT_NAMESPACE" ]; then
 QT_BUILD_KEY="$QT_BUILD_KEY $QT_NAMESPACE"
 fi
 MAC_NEED_TWO_BUILD_KEYS="no"
 if [ "$PLATFORM_MAC" = "yes" -a "$CFG_MAC_COCOA" = "yes" ]; then
 QT_BUILD_KEY_COMPAT="$CFG_USER_BUILD_KEY $UNAME_MACHINE $UNAME_SYSTEM $COMPILER $BUILD_OPTIONS"
 if [ -n "$QT_NAMESPACE" ]; then
 QT_BUILD_KEY_COMPAT="$QT_BUILD_KEY_COMPAT $QT_NAMESPACE"
 fi
 fi
+# is this compiler compatible with some other "standard" build key
+QT_BUILD_KEY_COMPAT_COMPILER=
+if [ ! -z "$COMPAT_COMPILER" ]; then
+QT_BUILD_KEY_COMPAT_COMPILER="$CFG_USER_BUILD_KEY $CFG_ARCH $TARGET_OPERATING_SYSTEM $COMPAT_COMPILER $BUILD_OPTIONS"
+if [ -n "$QT_NAMESPACE" ]; then
+QT_BUILD_KEY_COMPAT_COMPILER="$QT_BUILD_KEY_COMPAT_COMPILER $QT_NAMESPACE"
+fi
+fi
 # strip out leading/trailing/extra whitespace
 QT_BUILD_KEY=`echo $QT_BUILD_KEY | sed -e "s,  *, ,g" -e "s,^  *,," -e "s,  *$,,"`
 QT_BUILD_KEY_COMPAT=`echo $QT_BUILD_KEY_COMPAT | sed -e "s,  *, ,g" -e "s,^  *,," -e "s,  *$,,"`
+QT_BUILD_KEY_COMPAT_COMPILER=`echo $QT_BUILD_KEY_COMPAT_COMPILER | sed -e "s,  *, ,g" -e "s,^  *,," -e "s,  *$,,"`
 #-------------------------------------------------------------------------------
 # part of configuration information goes into qconfig.h
 #-------------------------------------------------------------------------------
 EOF
 fi
 if [ -n "$QT_BUILD_KEY_COMPAT" ]; then
 echo "#define QT_BUILD_KEY_COMPAT \"$QT_BUILD_KEY_COMPAT\"" \
+>> "$outpath/src/corelib/global/qconfig.h.new"
+fi
+if [ -n "$QT_BUILD_KEY_COMPAT_COMPILER" ]; then
+echo "#define QT_BUILD_KEY_COMPAT2 \"$QT_BUILD_KEY_COMPAT_COMPILER\"" \
 >> "$outpath/src/corelib/global/qconfig.h.new"
 fi
 echo "" >>"$outpath/src/corelib/global/qconfig.h.new"
 echo "#ifdef QT_BOOTSTRAPPED" >>"$outpath/src/corelib/global/qconfig.h.new"
 if [ "$PLATFORM_QWS" != "yes" ]; then
 [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"
 [ "$CFG_GRAPHICS_SYSTEM" = "opengl" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_OPENGL"
 [ "$CFG_GRAPHICS_SYSTEM" = "openvg" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_OPENVG"
+[ "$CFG_GRAPHICS_SYSTEM" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RUNTIME"
 fi
 # 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"
 #define QT_LIBINFIX "$QT_LIBINFIX"
 EOF
 fi
+if [ -n "$CFG_RUNTIME_SYSTEM" ]; then
+cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF
+#define QT_DEFAULT_RUNTIME_SYSTEM "$CFG_RUNTIME_SYSTEM"
+EOF
+fi
 # avoid unecessary rebuilds by copying only if qconfig.h has changed
 if cmp -s "$outpath/src/corelib/global/qconfig.h" "$outpath/src/corelib/global/qconfig.h.new"; then
 rm -f "$outpath/src/corelib/global/qconfig.h.new"
 else
 [ -f "$outpath/src/corelib/global/qconfig.h" ] && chmod +w "$outpath/src/corelib/global/qconfig.h"
 #namespaces
 QT_LIBINFIX = $QT_LIBINFIX
 QT_NAMESPACE = $QT_NAMESPACE
 QT_NAMESPACE_MAC_CRC = $QT_NAMESPACE_MAC_CRC
-#modules
-for(mod,\$\$list(\$\$files(\$\$[QMAKE_MKSPECS]/modules/qt_*.pri))):include(\$\$mod)
 EOF
 if [ "$CFG_RPATH" = "yes" ]; then
 echo "QMAKE_RPATHDIR += \"$QT_INSTALL_LIBS\"" >> "$QTCONFIG.tmp"
 fi
 if [ -n "$QT_GCC_MAJOR_VERSION" ]; then
 if [ -n "$QT_LFLAGS_SQLITE" ]; then
 echo "QT_LFLAGS_SQLITE   = $QT_LFLAGS_SQLITE" >> "$CACHEFILE.tmp"
 fi
 if [ -n "$QT_LFLAGS_ODBC" ]; then
 echo "QT_LFLAGS_ODBC   = $QT_LFLAGS_ODBC" >> "$CACHEFILE.tmp"
+fi
+if [ -n "$QT_LFLAGS_TDS" ]; then
+echo "QT_LFLAGS_TDS   = $QT_LFLAGS_TDS" >> "$CACHEFILE.tmp"
 fi
 if [ "$QT_EDITION" != "QT_EDITION_OPENSOURCE" ]; then
 echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$CACHEFILE.tmp"
 fi

changeset 37	758a864f9613
parent 33	3e2da88830cd