X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure;h=c780af362f5e703d8ed9316719aea33e4fd615fa;hb=e0d26ebe2e09c3d5756859972f9a71873786318a;hp=625c3ff430beec4dd2c44a0eb8605da4302fbfb9;hpb=ead7c1c33c12a078638202b98be7081a4d008780;p=profile%2Fivi%2Fqtbase.git diff --git a/configure b/configure index 625c3ff..c780af3 100755 --- a/configure +++ b/configure @@ -1,9 +1,8 @@ #!/bin/sh ############################################################################# ## -## Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -## All rights reserved. -## Contact: Nokia Corporation (qt-info@nokia.com) +## Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +## Contact: http://www.qt-project.org/ ## ## This file is the build configuration utility of the Qt Toolkit. ## @@ -36,6 +35,7 @@ ## ## ## +## ## $QT_END_LICENSE$ ## ############################################################################# @@ -188,11 +188,10 @@ PLATFORM_X11=no PLATFORM_QWS=no PLATFORM_QPA=yes BUILD_ON_MAC=no +PLATFORM_MAC=no if [ -d /System/Library/Frameworks/Carbon.framework ]; then - PLATFORM_MAC=maybe BUILD_ON_MAC=yes -else - PLATFORM_MAC=no + PLATFORM_MAC=maybe fi #----------------------------------------------------------------------------- @@ -231,7 +230,6 @@ fi #------------------------------------------------------------------------------- COMMERCIAL_USER=ask CFG_DEV=no -CFG_NOKIA=no CFG_EMBEDDED=no CFG_RTOS_ENABLED=yes EditionString=Commercial @@ -348,11 +346,6 @@ earlyArgParse() developer-build) CFG_DEV="yes" ;; - nokia-developer) - CFG_DEV="yes" - CFG_NOKIA="yes" - COMMERCIAL_USER="no" - ;; commercial) COMMERCIAL_USER="yes" ;; @@ -387,13 +380,7 @@ if [ "$COMMERCIAL_USER" = "ask" ]; then done fi -if [ "$CFG_NOKIA" = "yes" ]; then - Licensee="Nokia" - Edition="NokiaInternalBuild" - EditionString="Nokia Internal Build" - QT_EDITION="QT_EDITION_OPENSOURCE" - [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes -elif [ -f "$relpath"/LICENSE.PREVIEW.COMMERCIAL ] && [ $COMMERCIAL_USER = "yes" ]; then +if [ -f "$relpath"/LICENSE.PREVIEW.COMMERCIAL ] && [ $COMMERCIAL_USER = "yes" ]; then # Commercial preview release [ "$PLATFORM_MAC" = "maybe" ] && PLATFORM_MAC=yes Licensee="Preview" @@ -655,9 +642,6 @@ CFG_CONFIGURE_EXIT_ON_ERROR=yes CFG_PROFILE=no CFG_EXCEPTIONS=unspecified CFG_GUI=auto # (yes|no|auto) -CFG_SCRIPT=auto # (yes|no|auto) -CFG_SCRIPTTOOLS=auto # (yes|no|auto) -CFG_XMLPATTERNS=auto # (yes|no|auto) CFG_INCREMENTAL=auto CFG_QCONFIG=full CFG_DEBUG=auto @@ -671,18 +655,12 @@ CFG_XVIDEO=auto CFG_XINERAMA=runtime CFG_XFIXES=runtime CFG_ZLIB=auto -CFG_SYMBIAN_DEFFILES=auto -CFG_S60=auto CFG_SQLITE=qt CFG_GIF=auto -CFG_TIFF=auto -CFG_LIBTIFF=auto CFG_PNG=yes CFG_LIBPNG=auto CFG_JPEG=auto CFG_LIBJPEG=auto -CFG_MNG=auto -CFG_LIBMNG=auto CFG_XCURSOR=runtime CFG_XRANDR=runtime CFG_XRENDER=auto @@ -699,20 +677,14 @@ CFG_FONTCONFIG=auto CFG_QWS_FREETYPE=auto CFG_LIBFREETYPE=auto CFG_SQL_AVAILABLE= -QT_DEFAULT_BUILD_PARTS="libs examples demos tests" +QT_DEFAULT_BUILD_PARTS="libs examples tests" CFG_BUILD_PARTS="" CFG_NOBUILD_PARTS="" CFG_RELEASE_QMAKE=no -CFG_PHONON=auto -CFG_PHONON_BACKEND=yes -CFG_MULTIMEDIA=auto CFG_AUDIO_BACKEND=auto -CFG_SVG=auto -CFG_DECLARATIVE=auto +CFG_V8SNAPSHOT=auto CFG_DECLARATIVE_DEBUG=yes -CFG_WEBKIT=auto # (yes|no|auto|debug) CFG_JAVASCRIPTCORE_JIT=auto -CFG_LOCATION=auto CFG_GFX_AVAILABLE="linuxfb transformed qvfb vnc multiscreen directfb" CFG_GFX_ON="linuxfb multiscreen" @@ -749,9 +721,14 @@ CFG_DECORATION_AVAILABLE="styled windows default" CFG_DECORATION_ON="${CFG_DECORATION_AVAILABLE}" # all on by default CFG_DECORATION_PLUGIN_AVAILABLE= CFG_DECORATION_PLUGIN= +CFG_XINPUT2=auto CFG_XINPUT=runtime CFG_XKB=auto -CFG_XCB=no +CFG_XCB=auto +CFG_XCB_LIMITED=yes +CFG_WAYLAND=auto +CFG_LIBUDEV=auto +CFG_EVDEV=auto CFG_NIS=auto CFG_CUPS=auto CFG_ICONV=auto @@ -759,10 +736,8 @@ CFG_DBUS=auto CFG_GLIB=auto CFG_GSTREAMER=auto CFG_QGTKSTYLE=auto -CFG_QS60STYLE=auto CFG_LARGEFILE=auto CFG_OPENSSL=auto -CFG_PTMALLOC=no CFG_STL=auto CFG_PRECOMPILE=auto CFG_SEPARATE_DEBUG_INFO=no @@ -777,13 +752,10 @@ CFG_SSSE3=auto CFG_SSE4_1=auto CFG_SSE4_2=auto CFG_AVX=auto -CFG_REDUCE_RELOCATIONS=no -CFG_IPV6=auto +CFG_REDUCE_RELOCATIONS=auto CFG_NAS=no CFG_QWS_DEPTHS=all -CFG_USER_BUILD_KEY= CFG_ACCESSIBILITY=auto -CFG_QT3SUPPORT=yes CFG_ENDIAN=auto CFG_HOST_ENDIAN=auto CFG_DOUBLEFORMAT=auto @@ -803,9 +775,6 @@ CFG_MAC_ARCHS= MAC_CONFIG_TEST_COMMANDLINE= # used to make the configure tests run with the correct arch's and SDK settings CFG_MAC_DWARF2=auto CFG_MAC_XARCH=auto -CFG_MAC_CARBON=no -CFG_MAC_COCOA=yes -COMMANDLINE_MAC_CARBON=no CFG_MAC_HARFBUZZ=no CFG_SXE=no CFG_PREFIX_INSTALL=yes @@ -815,11 +784,11 @@ I_FLAGS= L_FLAGS= RPATH_FLAGS= l_FLAGS= +W_FLAGS= QCONFIG_FLAGS= -XPLATFORM= # This seems to be the QMAKESPEC, like "linux-g++" or "symbian-gcce" +XPLATFORM= # This seems to be the QMAKESPEC, like "linux-g++" XPLATFORM_MINGW=no # Whether target platform is MinGW (win32-g++*) -XPLATFORM_SYMBIAN=no # Whether target platform is SYMBIAN (*symbian*) -XPLATFORM_SYMBIAN_SBSV2=no # Whether target platform is SYMBIAN_SBSV2 (symbian-sbsv2) +XPLATFORM_MAEMO=no PLATFORM=$QMAKESPEC QT_CROSS_COMPILE=no OPT_CONFIRM_LICENSE=no @@ -828,14 +797,13 @@ 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 CFG_ICU=auto +CFG_FORCE_ASSERTS=no +CFG_PCRE=auto # initalize variables used for installation QT_INSTALL_PREFIX= @@ -849,7 +817,7 @@ QT_INSTALL_DATA= QT_INSTALL_TRANSLATIONS= QT_INSTALL_SETTINGS= QT_INSTALL_EXAMPLES= -QT_INSTALL_DEMOS= +QT_INSTALL_TESTS= QT_HOST_PREFIX= #flags for SQL drivers @@ -875,13 +843,6 @@ QT_LIBS_GLIB= QT_CFLAGS_GSTREAMER= QT_LIBS_GSTREAMER= -#flag for Symbian fpu settings -QT_CFLAGS_FPU= - -# flags for libconnsettings0 (used for Maemo ICD bearer management plugin) -QT_CFLAGS_CONNSETTINGS= -QT_LIBS_CONNSETTINGS= - #------------------------------------------------------------------------------- # check SQL drivers, mouse drivers and decorations available in this package #------------------------------------------------------------------------------- @@ -975,17 +936,10 @@ if [ "$CFG_EMBEDDED" = "nacl" ]; then L_FLAGS="$L_FLAGS -I${CFG_NACL_PATH}/toolchain/mac_x86/sdk/nacl-sdk/lib" fi - echo "-no-multimedia -no-webkit -no-phonon -no-nultimedia -no-mediaservices -no-xmlpatterns -no-script -no-sql-sqlite -nomake tests" - CFG_MULTIMEDIA=no - CFG_WEBKIT=no - CFG_PHONON=no - CFG_MULTIMEDIA=no + echo "-no-mediaservices -no-sql-sqlite -nomake tests" CFG_MEDIASERVICES=no - CFG_XMLPATTERNS=no - CFG_SCRIPT=no CFG_SQLITE=no CFG_SQL_sqlite=no - CFG_LIBTIFF=no CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS tests" QT_CONFIG="$QT_CONFIG nacl" fi @@ -1025,26 +979,13 @@ while [ "$#" -gt 0 ]; do VAR=`echo $1 | sed "s,^-[^-]*-\(.*\),\1,"` VAL=`echo $1 | sed "s,^-\([^-]*\).*,\1,"` ;; - #WebKit options - -webkit) - VAR="webkit" - VAL="yes" - ;; - -webkit-debug) - VAR="webkit" - VAL="debug" - ;; - -no-webkit) - VAR="webkit" - VAL="no" - ;; #Qt style no options -no-*) VAR=`echo $1 | sed "s,^-no-\(.*\),\1,"` VAL=no ;; #Qt style yes options - -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-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|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu) + -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-xinput2|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-wayland|-nis|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-debug-and-release|-exceptions|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-phonon-backend|-audio-backend|-declarative-debug|-javascript-jit|-rpath|-force-pkg-config|-icu|-force-asserts|-testcocoon) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` VAL=yes ;; @@ -1060,7 +1001,7 @@ while [ "$#" -gt 0 ]; do shift VAL=$1 ;; - -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config) + -prefix|-docdir|-headerdir|-plugindir|-importdir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-testsdir|-depths|-make|-nomake|-platform|-xplatform|-sdk|-arch|-host-arch|-mysql_config|-sysroot) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` shift VAL="$1" @@ -1147,16 +1088,6 @@ while [ "$#" -gt 0 ]; do shift VAL="$1" ;; - -graphicssystem) - VAR="graphicssystem" - shift - VAL=$1 - ;; - -runtimegraphicssystem) - VAR="runtimegraphicssystem" - shift - VAL=$1 - ;; -qtlibinfix) VAR="qtlibinfix" shift @@ -1230,6 +1161,10 @@ while [ "$#" -gt 0 ]; do VAL=`echo $1 | sed 's,-fw,,'` fi ;; + -W*) + VAR="add_warn" + VAL="$1" + ;; -*) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` VAL="unknown" @@ -1249,13 +1184,6 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=no case "$VAR" in - qt3support) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_QT3SUPPORT="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; accessibility) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_ACCESSIBILITY="$VAL" @@ -1314,8 +1242,8 @@ while [ "$#" -gt 0 ]; do examplesdir) QT_INSTALL_EXAMPLES="$VAL" ;; - demosdir) - QT_INSTALL_DEMOS="$VAL" + testsdir) + QT_INSTALL_TESTS="$VAL" ;; qconfig) CFG_QCONFIG="$VAL" @@ -1326,9 +1254,6 @@ while [ "$#" -gt 0 ]; do bindir) QT_INSTALL_BINS="$VAL" ;; - buildkey) - CFG_USER_BUILD_KEY="$VAL" - ;; sxe) CFG_SXE="$VAL" ;; @@ -1386,9 +1311,9 @@ while [ "$#" -gt 0 ]; do opengl) if [ "$VAL" = "auto" ] || [ "$VAL" = "desktop" ] || [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || - [ "$VAL" = "es1" ] || [ "$VAL" = "es2" ]; then + [ "$VAL" = "es2" ]; then CFG_OPENGL="$VAL" - if [ "$VAL" = "es1" ] || [ "$VAL" = "es2" ]; then + if [ "$VAL" = "es2" ]; then CFG_EGL="yes" fi else @@ -1405,33 +1330,6 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - graphicssystem) - if [ "$PLATFORM_QWS" = "yes" ]; then - echo "Error: Graphics System plugins are not supported on QWS." - echo " On QWS, the graphics system API is part of the QScreen plugin architecture " - echo " rather than existing as a separate plugin." - echo "" - UNKNOWN_OPT=yes - else - if [ "$VAL" = "opengl" ]; then - 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 [ "$VAL" = "yes" ]; then @@ -1459,7 +1357,7 @@ while [ "$#" -gt 0 ]; do PLATFORM_X11=yes ;; sdk) - if [ "$PLATFORM_MAC" = "yes" ]; then + if [ "$BUILD_ON_MAC" = "yes" ]; then CFG_SDK="$VAL" else UNKNOWN_OPT=yes @@ -1475,7 +1373,7 @@ while [ "$#" -gt 0 ]; do arch) # if this is a Mac then "windows" probably means # we are cross-compiling for MinGW - if [ "$PLATFORM_MAC" = "yes" ] && [ "$VAL" != "windows" ]; then + if [ "$BUILD_ON_MAC" = "yes" ] && [ "$VAL" != "windows" ]; then CFG_MAC_ARCHS="$CFG_MAC_ARCHS $VAL" else CFG_ARCH=$VAL @@ -1484,26 +1382,8 @@ while [ "$#" -gt 0 ]; do host-arch) CFG_HOST_ARCH=$VAL ;; - universal) - if [ "$PLATFORM_MAC" = "yes" ] && [ "$VAL" = "yes" ]; then - CFG_MAC_ARCHS="$CFG_MAC_ARCHS x86 ppc" - else - UNKNOWN_OPT=yes - fi - ;; - cocoa) -# do nothing - Cocoa is the default. - ;; - carbon) - if [ "$PLATFORM_MAC" = "yes" ] && [ "$VAL" = "yes" ]; then - CFG_MAC_CARBON="$VAL" - COMMANDLINE_MAC_CARBON="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; harfbuzz) - if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_CARBON" != "yes" ] && [ "$VAL" = "yes" ]; then + if [ "$BUILD_ON_MAC" = "yes" ] && [ "$VAL" = "yes" ]; then CFG_MAC_HARFBUZZ="$VAL" else UNKNOWN_OPT=yes @@ -1511,7 +1391,7 @@ while [ "$#" -gt 0 ]; do ;; framework) - if [ "$PLATFORM_MAC" = "yes" ] || [ "$PLATFORM_QPA" = "yes" ]; then + if [ "$BUILD_ON_MAC" = "yes" ]; then CFG_FRAMEWORK="$VAL" else UNKNOWN_OPT=yes @@ -1528,6 +1408,11 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + testcocoon) + if [ "$VAL" = "yes" ]; then + QTCONFIG_CONFIG="$QTCONFIG_CONFIG testcocoon" + fi + ;; exceptions|g++-exceptions) if [ "$VAL" = "no" ]; then CFG_EXCEPTIONS=no @@ -1590,7 +1475,6 @@ while [ "$#" -gt 0 ]; do esac if [ ! -z "$NATIVE_64_ARCH" ]; then QTCONFIG_CONFIG="$QTCONFIG_CONFIG $NATIVE_64_ARCH" - CFG_MAC_ARCHS="$CFG_MAC_ARCHS $NATIVE_64_ARCH" fi ;; esac @@ -1598,8 +1482,6 @@ while [ "$#" -gt 0 ]; do xplatform) XPLATFORM="$VAL" case `basename "$XPLATFORM"` in win32-g++*) XPLATFORM_MINGW=yes;; esac - case "$XPLATFORM" in *symbian*) XPLATFORM_SYMBIAN=yes;; esac - case "$XPLATFORM" in symbian-sbsv2) XPLATFORM_SYMBIAN_SBSV2=yes;; esac ;; debug-and-release) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then @@ -1634,7 +1516,7 @@ while [ "$#" -gt 0 ]; do debug) CFG_DEBUG="$VAL" ;; - developer-build|commercial|opensource|nokia-developer) + developer-build|commercial|opensource) # These switches have been dealt with already ;; static) @@ -1720,6 +1602,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + xinput2) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_XINPUT2="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; xinput) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then CFG_XINPUT="$VAL" @@ -1863,20 +1752,6 @@ while [ "$#" -gt 0 ]; do # No longer supported: #[ "$VAL" = "no" ] && CFG_LIBPNG=no ;; - s60) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_S60="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - usedeffiles) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_SYMBIAN_DEFFILES="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; sqlite) if [ "$VAL" = "system" ]; then CFG_SQLITE=system @@ -1900,22 +1775,6 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - libmng) - [ "$VAL" = "yes" ] && VAL=qt - if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then - CFG_LIBMNG="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; - libtiff) - [ "$VAL" = "yes" ] && VAL=qt - if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then - CFG_LIBTIFF="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; nas-sound) if [ "$VAL" = "system" ] || [ "$VAL" = "no" ]; then CFG_NAS="$VAL" @@ -1979,6 +1838,27 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + wayland) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_WAYLAND="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; + libudev) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_LIBUDEV="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; + evdev) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_EVDEV="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; cups) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_CUPS="$VAL" @@ -2014,13 +1894,6 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - style-s60) - if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ]; then - CFG_QS60STYLE="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; gui) if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then CFG_GUI="yes" @@ -2032,7 +1905,7 @@ while [ "$#" -gt 0 ]; do fi fi ;; - qdbus|dbus) + dbus) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "linked" ]; then CFG_DBUS="$VAL" elif [ "$VAL" = "runtime" ]; then @@ -2076,69 +1949,6 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - ptmalloc) - if [ "$VAL" = "yes" ]; then - CFG_PTMALLOC="yes" - else - UNKNOWN_OPT=yes - fi - ;; - - xmlpatterns) - if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then - CFG_XMLPATTERNS="yes" - else - if [ "$VAL" = "no" ]; then - CFG_XMLPATTERNS="no" - else - UNKNOWN_OPT=yes - fi - fi - ;; - script) - if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then - CFG_SCRIPT="yes" - else - if [ "$VAL" = "no" ]; then - CFG_SCRIPT="no" - else - UNKNOWN_OPT=yes - fi - fi - ;; - scripttools) - if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then - CFG_SCRIPTTOOLS="yes" - else - if [ "$VAL" = "no" ]; then - CFG_SCRIPTTOOLS="no" - else - UNKNOWN_OPT=yes - fi - fi - ;; - svg) - if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ]; then - CFG_SVG="yes" - else - if [ "$VAL" = "no" ]; then - CFG_SVG="no" - else - UNKNOWN_OPT=yes - fi - fi - ;; - declarative) - if [ "$VAL" = "yes" ]; then - CFG_DECLARATIVE="yes" - else - if [ "$VAL" = "no" ]; then - CFG_DECLARATIVE="no" - else - UNKNOWN_OPT=yes - fi - fi - ;; declarative-debug) if [ "$VAL" = "yes" ]; then CFG_DECLARATIVE_DEBUG="yes" @@ -2150,21 +1960,6 @@ while [ "$#" -gt 0 ]; do fi fi ;; - webkit) - [ "$VAL" = "auto" ] && VAL="yes" - CFG_WEBKIT="$VAL" - ;; - location) - if [ "$VAL" = "yes" ]; then - CFG_LOCATION="yes" - else - if [ "$VAL" = "no" ]; then - CFG_LOCATION="no" - else - UNKNOWN_OPT=yes - fi - fi - ;; javascript-jit) if [ "$VAL" = "yes" ] || [ "$VAL" = "auto" ] || [ "$VAL" = "no" ]; then CFG_JAVASCRIPTCORE_JIT="$VAL" @@ -2349,7 +2144,7 @@ while [ "$#" -gt 0 ]; do l_FLAGS="$l_FLAGS -l\"${VAL}\"" ;; add_fpath) - if [ "$PLATFORM_MAC" = "yes" ]; then + if [ "$BUILD_ON_MAC" = "yes" ]; then L_FLAGS="$L_FLAGS -F\"${VAL}\"" I_FLAGS="$I_FLAGS -F\"${VAL}\"" else @@ -2357,22 +2152,18 @@ while [ "$#" -gt 0 ]; do fi ;; add_framework) - if [ "$PLATFORM_MAC" = "yes" ]; then + if [ "$BUILD_ON_MAC" = "yes" ]; then l_FLAGS="$l_FLAGS -framework \"${VAL}\"" else UNKNOWN_OPT=yes fi ;; + add_warn) + W_FLAGS="$W_FLAGS \"${VAL}\"" + ;; silent) CFG_SILENT="$VAL" ;; - phonon) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_PHONON="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; phonon-backend) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_PHONON_BACKEND="$VAL" @@ -2380,13 +2171,6 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - multimedia) - if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then - CFG_MULTIMEDIA="$VAL" - else - UNKNOWN_OPT=yes - fi - ;; dont-process) CFG_NOPROCESS=yes ;; @@ -2400,11 +2184,6 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; - fpu) - if [ "$VAL" != "no" ]; then - QT_CFLAGS_FPU=$VAL - fi - ;; icu) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_ICU="$VAL" @@ -2412,6 +2191,20 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + force-asserts) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_FORCE_ASSERTS="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; + pcre) + if [ "$VAL" = "qt" ] || [ "$VAL" = "system" ]; then + CFG_PCRE="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; *) UNKNOWN_OPT=yes ;; @@ -2423,20 +2216,6 @@ while [ "$#" -gt 0 ]; do fi done -if [ "$CFG_QCONFIG" != "full" ] && [ "$CFG_QT3SUPPORT" = "yes" ]; then - echo "Warning: '-qconfig $CFG_QCONFIG' will disable the qt3support library." - CFG_QT3SUPPORT="no" -fi -if [ "$CFG_GUI" = "no" ]; then - echo "Warning: -no-gui will disable the qt3support library." - CFG_QT3SUPPORT="no" -fi - -#disable Qt3Support for Lighthouse -if [ "$PLATFORM_QPA" = "yes" ]; then - CFG_QT3SUPPORT="no" -fi - # update QT_CONFIG to show our current predefined configuration case "$CFG_QCONFIG" in minimal|small|medium|large|full) @@ -2464,7 +2243,6 @@ esac # where to find which.. unixtests="$relpath/config.tests/unix" mactests="$relpath/config.tests/mac" -symbiantests="$relpath/config.tests/symbian" WHICH="$unixtests/which.test" PERL=`$WHICH perl 2>/dev/null` @@ -2515,23 +2293,6 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "ye echo fi -# detect build style -if [ "$CFG_DEBUG" = "auto" ]; 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 - else - CFG_DEBUG_RELEASE=no - CFG_DEBUG=no - fi -fi -if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then - QMAKE_CONFIG="$QMAKE_CONFIG build_all" -fi - if [ "$CFG_SILENT" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG silent" fi @@ -2578,11 +2339,11 @@ if [ "$OPT_SHADOW" = "yes" ]; then if [ -x "$relpath/bin/syncqt" ]; then mkdir -p "$outpath/bin" echo "#!/bin/sh" >"$outpath/bin/syncqt" - echo "perl \"$relpath/bin/syncqt\" -outdir \"$outpath\" \"$relpath\" \"\$@\"" >>"$outpath/bin/syncqt" + echo "perl \"$relpath/bin/syncqt\" -qtdir \"$outpath\" \"\$@\"" >>"$outpath/bin/syncqt" chmod 755 "$outpath/bin/syncqt" fi - for i in elf2e32_qtwrapper createpackage patch_capabilities; do + for i in elf2e32_qtwrapper createpackage patch_capabilities qtmodule-configtests; do rm -f "$outpath/bin/$i" if [ -x "$relpath/bin/$i" ]; then mkdir -p "$outpath/bin" @@ -2617,11 +2378,6 @@ if [ "$OPT_SHADOW" = "yes" ]; then # symlink the doc directory rm -rf "$outpath/doc" ln -s "$relpath/doc" "$outpath/doc" - - # make sure q3porting.xml can be found - mkdir -p "$outpath/tools/porting/src" - rm -f "$outpath/tools/porting/src/q3porting.xml" - ln -s "$relpath/tools/porting/src/q3porting.xml" "$outpath/tools/porting/src" fi # symlink fonts to be able to run application from build directory @@ -2747,9 +2503,22 @@ if [ -z "$PLATFORM" ]; then PLATFORM_NOTES= case "$UNAME_SYSTEM:$UNAME_RELEASE" in Darwin:*) - if [ "$PLATFORM_MAC" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then - PLATFORM=macx-g++ - # PLATFORM=macx-xcode + if [ "$PLATFORM_QPA" = "yes" ]; then + OSX_VERSION=`uname -r | cut -d. -f1` + if [ "$OSX_VERSION" -ge 11 ]; then + # We're on Lion or above. Check if we have a supported Clang version + case "$(clang -v 2>&1 | grep -Po '(?<=version )\d[\d.]+')" in + 3.*) + PLATFORM=macx-clang + PLATFORM_NOTES="\n - Also available for Mac OS X: macx-g++\n" + ;; + *) + PLATFORM=macx-g++ + ;; + esac + else + PLATFORM=macx-g++ + fi else PLATFORM=darwin-g++ fi @@ -2918,8 +2687,7 @@ fi [ -z "$XPLATFORM" ] && XPLATFORM="$PLATFORM" case `basename "$XPLATFORM"` in win32-g++*) XPLATFORM_MINGW=yes;; esac -case "$XPLATFORM" in *symbian*) XPLATFORM_SYMBIAN=yes;; esac -case "$XPLATFORM" in symbian-sbsv2) XPLATFORM_SYMBIAN_SBSV2=yes;; esac +case "$XPLATFORM" in linux-g++-maemo) XPLATFORM_MAEMO=yes;; esac if [ -d "$PLATFORM" ]; then QMAKESPEC="$PLATFORM" @@ -2936,7 +2704,7 @@ if [ "$PLATFORM" != "$XPLATFORM" ]; then QMAKE_CONFIG="$QMAKE_CONFIG cross_compile" fi -if [ "$PLATFORM_MAC" = "yes" ]; then +if [ "$BUILD_ON_MAC" = "yes" ]; then if [ `basename $QMAKESPEC` = "macx-xcode" ] || [ `basename $XQMAKESPEC` = "macx-xcode" ]; then echo >&2 echo " Platform 'macx-xcode' should not be used when building Qt/Mac." >&2 @@ -2975,7 +2743,7 @@ if [ '!' -f "${XQMAKESPEC}/qplatformdefs.h" ]; then echo echo " $XQMAKESPEC/qplatformdefs.h" echo - echo " Please contact qt-bugs@trolltech.com." + echo " Please contact qt-info@nokia.com." echo exit 2 fi @@ -3070,21 +2838,6 @@ if [ -z "${CFG_HOST_ARCH}" ]; then esac esac ;; - Darwin:*:*) - case "$UNAME_MACHINE" in - Power?Macintosh) - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " 32-bit Apple PowerPC (powerpc)" - fi - ;; - x86) - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " 32-bit Intel 80x86 (i386)" - fi - ;; - esac - CFG_HOST_ARCH=macosx - ;; AIX:*:00????????00) if [ "$OPT_VERBOSE" = "yes" ]; then echo " 64-bit IBM PowerPC (powerpc)" @@ -3198,8 +2951,6 @@ if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then esac elif [ "$XPLATFORM_MINGW" = "yes" ]; then [ -z "$CFG_ARCH" ] && CFG_ARCH="windows" -elif [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - CFG_ARCH=symbian elif [ "$PLATFORM_MAC" = "yes" ] || [ -z "$CFG_ARCH" ]; then CFG_ARCH=$CFG_HOST_ARCH fi @@ -3214,29 +2965,6 @@ arm*) ;; esac -if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$CFG_ARCH' is supported" - fi -else - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$CFG_ARCH' is unsupported, using 'generic'" - fi - CFG_ARCH=generic -fi -if [ "$CFG_HOST_ARCH" != "$CFG_ARCH" ]; then - if [ -d "$relpath/src/corelib/arch/$CFG_HOST_ARCH" ]; then - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$CFG_HOST_ARCH' is supported" - fi - else - if [ "$OPT_VERBOSE" = "yes" ]; then - echo " '$CFG_HOST_ARCH' is unsupported, using 'generic'" - fi - CFG_HOST_ARCH=generic - fi -fi - if [ "$OPT_VERBOSE" = "yes" ]; then echo "System architecture: '$CFG_ARCH'" if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then @@ -3248,6 +2976,23 @@ fi # tests that don't need qmake (must be run before displaying help) #------------------------------------------------------------------------------- +# detect build style +if [ "$CFG_DEBUG" = "auto" ]; 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 + else + CFG_DEBUG_RELEASE=no + CFG_DEBUG=no + fi +fi +if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then + QT_CONFIG="$QT_CONFIG build_all" +fi + if [ -z "$PKG_CONFIG" ]; then # See if PKG_CONFIG is set in the mkspec: PKG_CONFIG=`getQMakeConf "$XQMAKESPEC" | sed -n -e 's%PKG_CONFIG[^_].*=%%p' | tr '\n' ' '` @@ -3288,29 +3033,8 @@ if [ "$QT_CROSS_COMPILE" = "yes" ]; then fi fi -# process CFG_MAC_ARCHS -if [ "$PLATFORM_MAC" = "yes" ]; then -# check -arch arguments for validity. - ALLOWED="x86 ppc x86_64 ppc64 i386" - # Save the list so we can re-write it using only valid values - CFG_MAC_ARCHS_IN="$CFG_MAC_ARCHS" - CFG_MAC_ARCHS= - for i in $CFG_MAC_ARCHS_IN - do - if echo "$ALLOWED" | grep -w -v "$i" > /dev/null 2>&1; then - echo "Unknown architecture: \"$i\". Supported architectures: x86[i386] ppc x86_64 ppc64"; - exit 2; - fi - if [ "$i" = "i386" -o "$i" = "x86" ]; then - # These are synonymous values - # CFG_MAC_ARCHS requires x86 while GCC requires i386 - CFG_MAC_ARCHS="$CFG_MAC_ARCHS x86" - MAC_CONFIG_TEST_COMMANDLINE="$MAC_CONFIG_TEST_COMMANDLINE -arch i386" - else - CFG_MAC_ARCHS="$CFG_MAC_ARCHS $i" - MAC_CONFIG_TEST_COMMANDLINE="$MAC_CONFIG_TEST_COMMANDLINE -arch $i" - fi - done +if [ ! -n "$PKG_CONFIG" ]; then + QT_CONFIG="$QT_CONFIG no-pkg-config" fi # pass on $CFG_SDK to the configure tests. @@ -3319,7 +3043,7 @@ if [ '!' -z "$CFG_SDK" ]; then fi # find the default framework value -if [ "$CFG_ARCH" = "macosx" ]; then +if [ "$BUILD_ON_MAC" = "yes" ]; then if [ "$CFG_FRAMEWORK" = "auto" ]; then CFG_FRAMEWORK="$CFG_SHARED" elif [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_SHARED" = "no" ]; then @@ -3337,7 +3061,6 @@ TEST_COMPILER="$CXX" [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then - #for Symbian we don't need this checking if [ -z "$TEST_COMPILER" ]; then echo "ERROR: Cannot set the compiler for the configuration tests" exit 1 @@ -3362,22 +3085,15 @@ export SYSROOT_FLAG # used by config.tests/unix/compile.test # auto-detect precompiled header support if [ "$CFG_PRECOMPILE" = "auto" ]; then - if [ `echo "$CFG_MAC_ARCHS" | wc -w` -gt 1 ]; then - CFG_PRECOMPILE=no - elif "$unixtests/precomp.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then + if "$unixtests/precomp.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then CFG_PRECOMPILE=no else CFG_PRECOMPILE=yes fi -elif [ "$CFG_PRECOMPILE" = "yes" ] && [ `echo "$CFG_MAC_ARCHS" | wc -w` -gt 1 ]; then - echo - echo "WARNING: Using universal binaries disables precompiled headers." - echo - CFG_PRECOMPILE=no fi #auto-detect DWARF2 on the mac -if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then +if [ "$BUILD_ON_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then CFG_MAC_DWARF2=no else @@ -3385,15 +3101,6 @@ if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then fi fi -# auto-detect support for -Xarch on the mac -if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" = "auto" ]; then - if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then - CFG_MAC_XARCH=no - else - CFG_MAC_XARCH=yes - fi -fi - # don't autodetect support for separate debug info on objcopy when # cross-compiling as lots of toolchains seems to have problems with this if [ "$QT_CROSS_COMPILE" = "yes" ] && [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ]; then @@ -3450,15 +3157,8 @@ if [ "$PLATFORM_QWS" = "yes" ] && [ "$CFG_OPENGL" = "auto" ]; then CFG_OPENGL=no fi -# mac -if [ "$PLATFORM_MAC" = "yes" ] && [ "$XPLATFORM_SYMBIAN" = "no" ]; then - if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then - CFG_OPENGL=desktop - fi -fi - # find the default framework value -if [ "$CFG_ARCH" = "macosx" ]; then +if [ "$BUILD_ON_MAC" = "yes" ]; then if [ "$CFG_FRAMEWORK" = "auto" ]; then CFG_FRAMEWORK="$CFG_SHARED" elif [ "$CFG_FRAMEWORK" = "yes" ] && [ "$CFG_SHARED" = "no" ]; then @@ -3471,18 +3171,6 @@ 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 @@ -3509,161 +3197,120 @@ fi # post process QT_INSTALL_* variables #------------------------------------------------------------------------------- -#prefix if [ -z "$QT_INSTALL_PREFIX" ]; then if [ "$CFG_DEV" = "yes" ]; then QT_INSTALL_PREFIX="$outpath" # In Development, we use sandboxed builds by default - elif [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then - if [ "$PLATFORM_QPA" = "yes" ]; then - QT_INSTALL_PREFIX="/usr/local/Trolltech/QtLighthouse-${QT_VERSION}" - else - QT_INSTALL_PREFIX="/usr/local/Trolltech/QtEmbedded-${QT_VERSION}" - fi - if [ "$PLATFORM" != "$XPLATFORM" ]; then - QT_INSTALL_PREFIX="${QT_INSTALL_PREFIX}-${CFG_ARCH}" - fi - elif [ -d "$EPOCROOT" ] && [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - QT_INSTALL_PREFIX="$EPOCROOT/epoc32/" - QT_INSTALL_LIBS="$EPOCROOT/epoc32/release/armv5/lib/" - fi else - QT_INSTALL_PREFIX="/usr/local/Trolltech/Qt-${QT_VERSION}" # the default install prefix is /usr/local/Trolltech/Qt-$QT_VERSION + QT_INSTALL_PREFIX="/usr/local/Qt-${QT_VERSION}" # the default install prefix is /usr/local/Qt-$QT_VERSION fi fi QT_INSTALL_PREFIX=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_PREFIX"` -if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - [ -z "$QT_HOST_PREFIX" ] && QT_HOST_PREFIX="$QT_INSTALL_PREFIX" - [ -z "$QT_INSTALL_DOCS" ] && QT_INSTALL_DOCS= - [ -z "$QT_INSTALL_HEADERS" ] && QT_INSTALL_HEADERS= - [ -z "$QT_INSTALL_LIBS" ] && QT_INSTALL_LIBS= - [ -z "$QT_INSTALL_BINS" ] && QT_INSTALL_BINS= - [ -z "$QT_INSTALL_PLUGINS" ] && QT_INSTALL_PLUGINS="\\\\resource\\\\qt$QT_LIBINFIX\\\\plugins" - [ -z "$QT_INSTALL_IMPORTS" ] && QT_INSTALL_IMPORTS="\\\\resource\\\\qt$QT_LIBINFIX\\\\imports" - [ -z "$QT_INSTALL_DATA" ] && QT_INSTALL_DATA= - [ -z "$QT_INSTALL_TRANSLATIONS" ] && QT_INSTALL_TRANSLATIONS="\\\\resource\\\\qt$QT_LIBINFIX\\\\translations" - [ -z "$QT_INSTALL_SETTINGS" ] && QT_INSTALL_SETTINGS= - [ -z "$QT_INSTALL_EXAMPLES" ] && QT_INSTALL_EXAMPLES= - [ -z "$QT_INSTALL_DEMOS" ] && QT_INSTALL_DEMOS= -else - #docs - if [ -z "$QT_INSTALL_DOCS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - QT_INSTALL_DOCS="/Developer/Documentation/Qt" - fi +if [ -z "$QT_INSTALL_DOCS" ]; then #default + if [ "$CFG_PREFIX_INSTALL" = "no" ]; then + if [ "$BUILD_ON_MAC" = "yes" ]; then + QT_INSTALL_DOCS="/Developer/Documentation/Qt" fi - [ -z "$QT_INSTALL_DOCS" ] && QT_INSTALL_DOCS="$QT_INSTALL_PREFIX/doc" #fallback - fi - QT_INSTALL_DOCS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DOCS"` + [ -z "$QT_INSTALL_DOCS" ] && QT_INSTALL_DOCS="$QT_INSTALL_PREFIX/doc" #fallback - #headers - if [ -z "$QT_INSTALL_HEADERS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - if [ "$CFG_FRAMEWORK" = "yes" ]; then - QT_INSTALL_HEADERS= - fi +fi +QT_INSTALL_DOCS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DOCS"` + +if [ -z "$QT_INSTALL_HEADERS" ]; then #default + if [ "$CFG_PREFIX_INSTALL" = "no" ]; then + if [ "$BUILD_ON_MAC" = "yes" ]; then + if [ "$CFG_FRAMEWORK" = "yes" ]; then + QT_INSTALL_HEADERS= fi fi - [ -z "$QT_INSTALL_HEADERS" ] && QT_INSTALL_HEADERS="$QT_INSTALL_PREFIX/include" - fi - QT_INSTALL_HEADERS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_HEADERS"` + [ -z "$QT_INSTALL_HEADERS" ] && QT_INSTALL_HEADERS="$QT_INSTALL_PREFIX/include" - #libs - if [ -z "$QT_INSTALL_LIBS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - if [ "$CFG_FRAMEWORK" = "yes" ]; then - QT_INSTALL_LIBS="/Libraries/Frameworks" - fi +fi +QT_INSTALL_HEADERS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_HEADERS"` + +if [ -z "$QT_INSTALL_LIBS" ]; then #default + if [ "$CFG_PREFIX_INSTALL" = "no" ]; then + if [ "$BUILD_ON_MAC" = "yes" ]; then + if [ "$CFG_FRAMEWORK" = "yes" ]; then + QT_INSTALL_LIBS="/Libraries/Frameworks" fi fi - [ -z "$QT_INSTALL_LIBS" ] && QT_INSTALL_LIBS="$QT_INSTALL_PREFIX/lib" #fallback fi - QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"` + [ -z "$QT_INSTALL_LIBS" ] && QT_INSTALL_LIBS="$QT_INSTALL_PREFIX/lib" #fallback +fi +QT_INSTALL_LIBS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_LIBS"` - #bins - if [ -z "$QT_INSTALL_BINS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - QT_INSTALL_BINS="/Developer/Applications/Qt" - fi +if [ -z "$QT_INSTALL_BINS" ]; then #default + if [ "$CFG_PREFIX_INSTALL" = "no" ]; then + if [ "$BUILD_ON_MAC" = "yes" ]; then + QT_INSTALL_BINS="/Developer/Applications/Qt" fi - [ -z "$QT_INSTALL_BINS" ] && QT_INSTALL_BINS="$QT_INSTALL_PREFIX/bin" #fallback - fi - QT_INSTALL_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_BINS"` + [ -z "$QT_INSTALL_BINS" ] && QT_INSTALL_BINS="$QT_INSTALL_PREFIX/bin" #fallback +fi +QT_INSTALL_BINS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_BINS"` - #plugins - if [ -z "$QT_INSTALL_PLUGINS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - QT_INSTALL_PLUGINS="/Developer/Applications/Qt/plugins" - fi +if [ -z "$QT_INSTALL_PLUGINS" ]; then #default + if [ "$CFG_PREFIX_INSTALL" = "no" ]; then + if [ "$BUILD_ON_MAC" = "yes" ]; then + QT_INSTALL_PLUGINS="/Developer/Applications/Qt/plugins" fi - [ -z "$QT_INSTALL_PLUGINS" ] && QT_INSTALL_PLUGINS="$QT_INSTALL_PREFIX/plugins" #fallback fi - QT_INSTALL_PLUGINS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_PLUGINS"` + [ -z "$QT_INSTALL_PLUGINS" ] && QT_INSTALL_PLUGINS="$QT_INSTALL_PREFIX/plugins" #fallback +fi +QT_INSTALL_PLUGINS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_PLUGINS"` - #imports - if [ -z "$QT_INSTALL_IMPORTS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - QT_INSTALL_IMPORTS="/Developer/Applications/Qt/imports" - fi +if [ -z "$QT_INSTALL_IMPORTS" ]; then #default + if [ "$CFG_PREFIX_INSTALL" = "no" ]; then + if [ "$BUILD_ON_MAC" = "yes" ]; then + QT_INSTALL_IMPORTS="/Developer/Applications/Qt/imports" fi - [ -z "$QT_INSTALL_IMPORTS" ] && QT_INSTALL_IMPORTS="$QT_INSTALL_PREFIX/imports" #fallback fi - QT_INSTALL_IMPORTS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_IMPORTS"` + [ -z "$QT_INSTALL_IMPORTS" ] && QT_INSTALL_IMPORTS="$QT_INSTALL_PREFIX/imports" #fallback +fi +QT_INSTALL_IMPORTS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_IMPORTS"` - #data - if [ -z "$QT_INSTALL_DATA" ]; then #default - QT_INSTALL_DATA="$QT_INSTALL_PREFIX" - fi - QT_INSTALL_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DATA"` +if [ -z "$QT_INSTALL_DATA" ]; then #default + QT_INSTALL_DATA="$QT_INSTALL_PREFIX" +fi +QT_INSTALL_DATA=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DATA"` - #translations - if [ -z "$QT_INSTALL_TRANSLATIONS" ]; then #default - QT_INSTALL_TRANSLATIONS="$QT_INSTALL_PREFIX/translations" - fi - QT_INSTALL_TRANSLATIONS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_TRANSLATIONS"` +if [ -z "$QT_INSTALL_TRANSLATIONS" ]; then #default + QT_INSTALL_TRANSLATIONS="$QT_INSTALL_PREFIX/translations" +fi +QT_INSTALL_TRANSLATIONS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_TRANSLATIONS"` - #settings - if [ -z "$QT_INSTALL_SETTINGS" ]; then #default - if [ "$PLATFORM_MAC" = "yes" ]; then - QT_INSTALL_SETTINGS=/Library/Preferences/Qt - else - QT_INSTALL_SETTINGS=/etc/xdg - fi +if [ -z "$QT_INSTALL_SETTINGS" ]; then #default + if [ "$BUILD_ON_MAC" = "yes" ]; then + QT_INSTALL_SETTINGS=/Library/Preferences/Qt + else + QT_INSTALL_SETTINGS=/etc/xdg fi - QT_INSTALL_SETTINGS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_SETTINGS"` +fi +QT_INSTALL_SETTINGS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_SETTINGS"` - #examples - if [ -z "$QT_INSTALL_EXAMPLES" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - QT_INSTALL_EXAMPLES="/Developer/Examples/Qt" - fi +if [ -z "$QT_INSTALL_EXAMPLES" ]; then #default + if [ "$CFG_PREFIX_INSTALL" = "no" ]; then + if [ "$BUILD_ON_MAC" = "yes" ]; then + QT_INSTALL_EXAMPLES="/Developer/Examples/Qt" fi - [ -z "$QT_INSTALL_EXAMPLES" ] && QT_INSTALL_EXAMPLES="$QT_INSTALL_PREFIX/examples" #fallback fi - QT_INSTALL_EXAMPLES=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_EXAMPLES"` + [ -z "$QT_INSTALL_EXAMPLES" ] && QT_INSTALL_EXAMPLES="$QT_INSTALL_PREFIX/examples" #fallback +fi +QT_INSTALL_EXAMPLES=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_EXAMPLES"` - #demos - if [ -z "$QT_INSTALL_DEMOS" ]; then #default - if [ "$CFG_PREFIX_INSTALL" = "no" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then - QT_INSTALL_DEMOS="/Developer/Examples/Qt/Demos" - fi +#tests +if [ -z "$QT_INSTALL_TESTS" ]; then #default + if [ "$CFG_PREFIX_INSTALL" = "no" ]; then + if [ "$BUILD_ON_MAC" = "yes" ]; then + QT_INSTALL_TESTS="/Developer/Tests/Qt" fi - [ -z "$QT_INSTALL_DEMOS" ] && QT_INSTALL_DEMOS="$QT_INSTALL_PREFIX/demos" fi - QT_INSTALL_DEMOS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_DEMOS"` + [ -z "$QT_INSTALL_TESTS" ] && QT_INSTALL_TESTS="$QT_INSTALL_PREFIX/tests" #fallback fi +QT_INSTALL_TESTS=`"$relpath/config.tests/unix/makeabs" "$QT_INSTALL_TESTS"` #------------------------------------------------------------------------------- # help - interactive parts of the script _after_ this section please @@ -3707,10 +3354,6 @@ if [ "$OPT_HELP" = "yes" ]; then SHY=" " SHN="*" fi - if [ "$CFG_IPV6" = "auto" ]; then - I6Y="*" - I6N=" " - fi if [ "$CFG_PRECOMPILE" = "auto" ] || [ "$CFG_PRECOMPILE" = "no" ]; then PHY=" " PHN="*" @@ -3720,41 +3363,53 @@ if [ "$OPT_HELP" = "yes" ]; then fi if [ "$CFG_XCB" = "no" ]; then - XCY=" " - XCN="*" + XCBY=" " + XCBN="*" else - XCY="*" - XCN=" " + XCBY="*" + XCBN=" " + fi + + if [ "$CFG_WAYLAND" = "no" ]; then + XWY=" " + XWN="*" + else + XWY="*" + XWN=" " + fi + if [ "$CFG_XINPUT2" = "no" ]; then + X2Y=" " + X2N="*" + else + X2Y="*" + X2N=" " fi cat <] [-prefix-install] [-bindir ] [-libdir ] [-docdir ] [-headerdir ] [-plugindir ] [-importdir ] [-datadir ] - [-translationdir ] [-sysconfdir ] [-examplesdir ] - [-demosdir ] [-buildkey ] [-release] [-debug] - [-debug-and-release] [-developer-build] [-shared] [-static] [-no-fast] [-fast] [-no-largefile] + [-translationdir ] [-sysconfdir ] [-examplesdir ] [-testsdir ] + [-release] [-debug] [-debug-and-release] + [-developer-build] [-shared] [-static] [-no-fast] [-fast] [-no-largefile] [-largefile] [-no-exceptions] [-exceptions] [-no-accessibility] [-accessibility] [-no-stl] [-stl] [-no-sql-] [-sql-] - [-plugin-sql-] [-system-sqlite] [-no-qt3support] [-qt3support] + [-plugin-sql-] [-system-sqlite] [-platform] [-D ] [-I ] [-L ] [-help] - [-qt-zlib] [-system-zlib] [-no-gif] [-no-libtiff] [-qt-libtiff] [-system-libtiff] - [-no-libpng] [-qt-libpng] [-system-libpng] [-no-libmng] [-qt-libmng] - [-system-libmng] [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg] [-make ] + [-qt-zlib] [-system-zlib] [-no-gif] [-no-libpng] [-qt-libpng] [-system-libpng] + [-no-libjpeg] [-qt-libjpeg] [-system-libjpeg] [-make ] [-nomake ] [-R ] [-l ] [-no-rpath] [-rpath] [-continue] [-verbose] [-v] [-silent] [-no-nis] [-nis] [-no-cups] [-cups] [-no-iconv] [-iconv] [-no-pch] [-pch] [-no-dbus] [-dbus] [-dbus-linked] [-no-gui] [-no-separate-debug-info] [-no-mmx] [-no-3dnow] [-no-sse] [-no-sse2] [-no-sse3] [-no-ssse3] [-no-sse4.1] [-no-sse4.2] [-no-avx] [-no-neon] [-qtnamespace ] [-qtlibinfix ] [-separate-debug-info] [-armfpa] - [-no-optimized-qmake] [-optimized-qmake] [-no-xmlpatterns] [-xmlpatterns] - [-no-multimedia] [-multimedia] [-no-phonon] [-phonon] [-no-phonon-backend] [-phonon-backend] - [-no-media-backend] [-media-backend] [-no-audio-backend] [-audio-backend] + [-no-phonon-backend] [-phonon-backend] [-no-media-backend] [-media-backend] + [-no-audio-backend] [-audio-backend] + [-no-javascript-jit] [-javascript-jit] [-no-declarative-debug] [-declarative-debug] + [-no-optimized-qmake] [-optimized-qmake] [-no-openssl] [-openssl] [-openssl-linked] - [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit] [-webkit-debug] - [-no-javascript-jit] [-javascript-jit] - [-no-script] [-script] [-no-scripttools] [-scripttools] - [-no-declarative] [-declarative] [-no-declarative-debug] [-declarative-debug] - [-no-location] [-location] + [-no-gtkstyle] [-gtkstyle] + [-qt-pcre] [-system-pcre] [additional platform specific options (see below)] @@ -3808,14 +3463,8 @@ cat < .... Examples will be installed to (default PREFIX/examples) - -demosdir ....... Demos will be installed to - (default PREFIX/demos) - - You may use these options to turn on strict plugin loading. - - -buildkey .... Build the Qt library and plugins using the specified - . When the library loads plugins, it will only - load those that have a matching key. + -testsdir ....... Tests will be installed to + (default PREFIX/tests) Configure options: @@ -3883,52 +3532,15 @@ fi -system-sqlite ..... Use sqlite from the operating system. - -no-qt3support ..... Disables the Qt 3 support functionality. - * -qt3support ........ Enables the Qt 3 support functionality. - - -no-xmlpatterns .... Do not build the QtXmlPatterns module. - + -xmlpatterns ....... Build the QtXmlPatterns module. - QtXmlPatterns is built if a decent C++ compiler - is used and exceptions are enabled. - - -no-multimedia ..... Do not build the QtMultimedia module. - + -multimedia ........ Build the QtMultimedia module. - - -no-audio-backend .. Do not build the platform audio backend into QtMultimedia. - + -audio-backend ..... Build the platform audio backend into QtMultimedia if available. - - -no-phonon ......... Do not build the Phonon module. - + -phonon ............ Build the Phonon module. - Phonon is built if a decent C++ compiler is used. -no-phonon-backend.. Do not build the platform phonon plugin. + -phonon-backend..... Build the platform phonon plugin. - -no-svg ............ Do not build the SVG module. - + -svg ............... Build the SVG module. - - -no-webkit ......... Do not build the WebKit module. - + -webkit ............ Build the WebKit module. - WebKit is built if a decent C++ compiler is used. - -webkit-debug ...... Build the WebKit module with debug symbols. - -no-javascript-jit . Do not build the JavaScriptCore JIT compiler. + -javascript-jit .... Build the JavaScriptCore JIT compiler. - -no-script ......... Do not build the QtScript module. - + -script ............ Build the QtScript module. - - -no-scripttools .... Do not build the QtScriptTools module. - + -scripttools ....... Build the QtScriptTools module. - - -no-declarative ..... Do not build the declarative module. - + -declarative ....... Build the declarative module. - -no-declarative-debug ..... Do not build the declarative debugging support. + -declarative-debug ....... Build the declarative debugging support. - -no-location ....... Do not build the QtLocation module. - + -location .......... Build the QtLocation module. - -platform target ... The operating system and compiler you are building on ($PLATFORM). @@ -3962,6 +3574,8 @@ cat << EOF -qtnamespace Wraps all Qt library code in 'namespace {...}'. -qtlibinfix Renames all libQt*.so to libQt*.so. + -testcocoon Instrument Qt with the TestCocoon code coverage tool. + -D ........ Add an explicit define to the preprocessor. -I ........ Add an explicit include path. -L ........ Add an explicit library path. @@ -3976,21 +3590,11 @@ Third Party Libraries: -no-gif ............ Do not compile GIF reading support. - -no-libtiff ........ Do not compile TIFF support. - -qt-libtiff ........ Use the libtiff bundled with Qt. - + -system-libtiff .... Use libtiff from the operating system. - See http://www.libtiff.org - -no-libpng ......... Do not compile PNG support. -qt-libpng ......... Use the libpng bundled with Qt. + -system-libpng ..... Use libpng from the operating system. See http://www.libpng.org/pub/png - -no-libmng ......... Do not compile MNG support. - -qt-libmng ......... Use the libmng bundled with Qt. - + -system-libmng ..... Use libmng from the operating system. - See http://www.libmng.com - -no-libjpeg ........ Do not compile JPEG support. -qt-libjpeg ........ Use the libjpeg bundled with Qt. + -system-libjpeg .... Use libjpeg from the operating system. @@ -4000,8 +3604,8 @@ Third Party Libraries: + -openssl ........... Enable run-time OpenSSL support. -openssl-linked .... Enabled linked OpenSSL support. - -ptmalloc .......... Override the system memory allocator with ptmalloc. - (Experimental.) + -qt-pcre ........... Use the PCRE library bundled with Qt. + + -system-pcre ....... Use the PCRE library from the operating system. Additional options: @@ -4052,6 +3656,9 @@ Additional options: -reduce-relocations ..... Reduce relocations in the libraries through extra linker optimizations (Qt/X11 and Qt for Embedded Linux only; experimental; needs GNU ld >= 2.18). + + -force-asserts ........ Force Q_ASSERT to be enabled even in release builds. + EOF if [ "$CFG_SEPARATE_DEBUG_INFO" = "auto" ]; then @@ -4077,13 +3684,27 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "ye $SBN -no-separate-debug-info . Do not store debug information in a separate file. $SBY -separate-debug-info .... Strip debug information into a separate .debug file. - $XKN -no-xcb ............ Do not compile Xcb (X protocol C-language Binding) support. - $XKY -xcb ............... Compile Xcb support. + $XCBN -no-xcb ............ Do not compile Xcb (X protocol C-language Binding) support. + $XCBY -xcb ............... Compile Xcb support. + + $XWN -no-wayland......... Do not compile Wayland support. + $XWY -wayland .......... Compile Wayland support. EOF fi # X11/QWS +if [ "$XPLATFORM_MAEMO" = "yes" ]; then + + cat << EOF + + $X2N -no-xinput2......... Do not compile XInput2 support. + $X2Y -xinput2............ Compile XInput2 support. + +EOF + +fi + if [ "$PLATFORM_X11" = "yes" ]; then if [ "$CFG_SM" = "no" ]; then SMY=" " @@ -4197,9 +3818,9 @@ Qt/X11 only: + -opengl ...... Enable OpenGL support. With no parameter, this will auto-detect the "best" OpenGL API to use. If desktop OpenGL is available, it - will be used. Use desktop, es1, or es2 for - to force the use of the Desktop (OpenGL 1.x or 2.x), - OpenGL ES 1.x Common profile, or 2.x APIs instead. + will be used. Use desktop or es2 for + to force the use of the Desktop OpenGL or + OpenGL ES 2 APIs instead. -no-openvg ........ Do not support OpenVG. + -openvg ........... Enable OpenVG support. @@ -4270,7 +3891,7 @@ Qt/X11 only: EOF fi -if [ "$PLATFORM_MAC" = "yes" ]; then +if [ "$BUILD_ON_MAC" = "yes" ]; then cat << EOF Qt/Mac only: @@ -4278,12 +3899,6 @@ Qt/Mac only: -Fstring ........... Add an explicit framework path. -fw string ......... Add an explicit framework. - -cocoa ............. [Deprecated] Cocoa is now enabled by default. - - -carbon .............Build the Carbon version of Qt. 64-bit archs - are not supported by carbon and will be built - with cocoa - * -framework ......... Build Qt as a series of frameworks and link tools against those frameworks. -no-framework ...... Do not build Qt as a series of frameworks. @@ -4291,17 +3906,13 @@ Qt/Mac only: * -dwarf2 ............ Enable dwarf2 debugging symbols. -no-dwarf2 ......... Disable dwarf2 debugging symbols. - -universal ......... Equivalent to -arch "ppc x86" - - -arch ....... Build Qt for - Example values for : x86 ppc x86_64 ppc64 - Multiple -arch arguments can be specified. + -arch ....... Build Qt for . Supported arch values: x86 x86_64. + Only one arch value can be specified. -sdk ......... Build Qt using Apple provided SDK . This option requires gcc 4. To use a different SDK with gcc 3.3, set the SDKROOT environment variable. -harfbuzz .......... Use HarfBuzz to do text layout instead of Core Text when possible. - It is only available to Cocoa builds. * -no-harfbuzz ....... Disable HarfBuzz on Mac. It can still be enabled by setting QT_ENABLE_HARFBUZZ environment variable. @@ -4359,9 +3970,9 @@ if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then -no-opengl .......... Do not support OpenGL. -opengl ....... Enable OpenGL ES support - With no parameter, this will attempt to auto-detect OpenGL ES 1.x - or 2.x, or regular desktop OpenGL. - Use es1 or es2 for to override auto-detection. + With no parameter, this will attempt to auto-detect + OpenGL ES 2, or regular desktop OpenGL. + Use es2 for to override auto-detection. EOF fi @@ -4426,19 +4037,6 @@ if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" -o "$PLATFORM_X11" = "ye EOF fi -if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - cat << EOF - -Qt for Symbian only: - -no-s60 ............ Do not compile in S60 support. - + -s60 ............... Compile with support for the S60 UI Framework. - -no-style-s60....... Disable s60 style - + -qt-style-s60....... Enable s60 style in the Qt Library - - -no-usedeffiles .... Disable the usage of DEF files. - * -usedeffiles ....... Enable the usage of DEF files. -EOF -fi [ "x$ERROR" = "xyes" ] && exit 1 exit 0 fi # Help @@ -4452,10 +4050,6 @@ if [ "$PLATFORM_QWS" = "yes" ]; then Platform="Qt for Embedded Linux" elif [ "$PLATFORM_QPA" = "yes" ]; then Platform="Qt Lighthouse" -elif [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - Platform="Qt for Symbian" -elif [ "$PLATFORM_MAC" = "yes" ]; then - Platform="Qt for Mac OS X" elif [ "$XPLATFORM_MINGW" = "yes" ]; then Platform="Qt for Windows" elif [ '!' -z "`getQMakeConf \"$XQMAKESPEC\" | grep QMAKE_LIBS_X11 | awk '{print $3;}'`" ]; then @@ -4467,11 +4061,7 @@ echo echo "This is the $Platform ${EditionString} Edition." echo -if [ "$Edition" = "NokiaInternalBuild" ]; then - echo "Detected -nokia-developer option" - echo "Nokia employees and agents are allowed to use this software under" - echo "the authority of Nokia Corporation and/or its subsidiary(-ies)" -elif [ "$Edition" = "OpenSource" ]; then +if [ "$Edition" = "OpenSource" ]; then while true; do echo "You are licensed to use this software under the terms of" echo "the Lesser GNU General Public License (LGPL) versions 2.1." @@ -4657,7 +4247,7 @@ DATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_INSTA 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"` +TESTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_tstspath=$QT_INSTALL_TESTS"` TODAY=`date +%Y-%m-%d` cat > "$outpath/src/corelib/global/qconfig.cpp.new" <> "$outpath/src/corelib/global/qconfig.cpp.new" <> "$outpath/src/corelib/global/qconfig.cpp.new" <> "$mkfile" + echo "export MACOSX_DEPLOYMENT_TARGET = 10.6" >> "$mkfile" echo "CARBON_LFLAGS =-framework ApplicationServices" >>"$mkfile" echo "CARBON_CFLAGS =-fconstant-cfstrings" >>"$mkfile" EXTRA_LFLAGS="$EXTRA_LFLAGS \$(CARBON_LFLAGS)" @@ -4927,20 +4517,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(CARBON_CFLAGS)" EXTRA_OBJS="qsettings_mac.o qcore_mac.o" EXTRA_SRCS="\"$relpath/src/corelib/io/qsettings_mac.cpp\" \"$relpath/src/corelib/kernel/qcore_mac.cpp\"" - if echo "$CFG_MAC_ARCHS" | grep x86 > /dev/null 2>&1; then # matches both x86 and x86_64 - X86_CFLAGS="-arch i386" - X86_LFLAGS="-arch i386" - EXTRA_CFLAGS="$X86_CFLAGS $EXTRA_CFLAGS" - EXTRA_CXXFLAGS="$X86_CFLAGS $EXTRA_CXXFLAGS" - EXTRA_LFLAGS="$EXTRA_LFLAGS $X86_LFLAGS" - fi - if echo "$CFG_MAC_ARCHS" | grep ppc > /dev/null 2>&1; then # matches both ppc and ppc64 - PPC_CFLAGS="-arch ppc" - PPC_LFLAGS="-arch ppc" - EXTRA_CFLAGS="$PPC_CFLAGS $EXTRA_CFLAGS" - EXTRA_CXXFLAGS="$PPC_CFLAGS $EXTRA_CXXFLAGS" - EXTRA_LFLAGS="$EXTRA_LFLAGS $PPC_LFLAGS" - fi if [ '!' -z "$CFG_SDK" ]; then echo "SDK_LFLAGS =-Wl,-syslibroot,$CFG_SDK" >>"$mkfile" echo "SDK_CFLAGS =-isysroot $CFG_SDK" >>"$mkfile" @@ -5099,53 +4675,6 @@ fi [ "$XPLATFORM_MINGW" = "yes" ] && QMakeVar add styles "windowsxp windowsvista" -if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - QMakeVar set styles "windows s60" #overwrite previous default - CFG_LIBFREETYPE=no - CFG_ZLIB=yes - - if [ "$CFG_LARGEFILE" = auto ]; then - CFG_LARGEFILE=no - fi - if [ "$CFG_PHONON" = auto ]; then - CFG_PHONON=yes - fi - - if test -z "$EPOCROOT"; then - echo "Please export EPOCROOT. It should point to the sdk install dir" - exit 1 - fi - if test ! -d "$EPOCROOT/epoc32"; then - echo "Could not find the 'epoc32' dir in your EPOCROOT." - exit 1 - fi - - if [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then - # Raptor does not support configure tests. - - # the main commands needed to compile; - (mkdir -p config.tests/symbian/rcomp - cd config.tests/symbian/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 -fi - # detect zlib if [ "$CFG_ZLIB" = "no" ]; then # Note: Qt no longer support builds without zlib @@ -5173,32 +4702,6 @@ if [ "$CFG_LARGEFILE" = "auto" ]; then CFG_LARGEFILE=yes fi - -if [ "$CFG_S60" = "auto" ]; then - if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - CFG_S60=yes - else - CFG_S60=no - fi -fi - -if [ "$CFG_QS60STYLE" = "auto" ]; then - if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - CFG_QS60STYLE=qt - else - CFG_QS60STYLE=no - fi -fi - -if [ "$CFG_SYMBIAN_DEFFILES" = "auto" ]; then - # elf2e32 crashes when using def files together with gcce. - if [ "$XPLATFORM_SYMBIAN" = "yes" ] && [ "$CFG_DEV" = "no" ] && [ "$XPLATFORM" != "symbian-gcce" ]; then - CFG_SYMBIAN_DEFFILES=yes - else - CFG_SYMBIAN_DEFFILES=no - fi -fi - # detect how jpeg should be built if [ "$CFG_JPEG" = "auto" ]; then if [ "$CFG_SHARED" = "yes" ]; then @@ -5225,41 +4728,6 @@ if [ "$CFG_GIF" = "auto" ]; then fi fi -# detect how tiff should be built -if [ "$CFG_TIFF" = "auto" ]; then - if [ "$CFG_SHARED" = "yes" ]; then - CFG_TIFF=plugin - else - CFG_TIFF=yes - fi -fi - -# detect tiff -if [ "$CFG_LIBTIFF" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libtiff "libtiff" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then - CFG_LIBTIFF=system - else - CFG_LIBTIFF=qt - fi -fi - -# detect how mng should be built -if [ "$CFG_MNG" = "auto" ]; then - if [ "$CFG_SHARED" = "yes" ]; then - CFG_MNG=plugin - else - CFG_MNG=yes - fi -fi -# detect mng -if [ "$CFG_LIBMNG" = "auto" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libmng "libmng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then - CFG_LIBMNG=system - else - CFG_LIBMNG=qt - fi -fi - # detect png if [ "$CFG_LIBPNG" = "auto" ]; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libpng "libpng" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then @@ -5271,12 +4739,7 @@ fi # detect accessibility if [ "$CFG_ACCESSIBILITY" = "auto" ]; then - if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - # accessibility is currently unsupported - CFG_ACCESSIBILITY=no - else - CFG_ACCESSIBILITY=yes - fi + CFG_ACCESSIBILITY=yes fi # auto-detect SQL-modules support @@ -5365,7 +4828,7 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do ;; odbc) if [ "$CFG_SQL_odbc" != "no" ]; then - if ( [ "$PLATFORM_MAC" != "yes" ] || [ "$XPLATFORM_MINGW" = "yes" ] ) && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then + if ( [ "$BUILD_ON_MAC" != "yes" ] || [ "$XPLATFORM_MINGW" = "yes" ] ) && "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/odbc "ODBC" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then if [ "$CFG_SQL_odbc" = "auto" ]; then CFG_SQL_odbc=plugin fi @@ -5487,15 +4950,6 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do fi ;; sqlite) - if [ "$CFG_SQL_sqlite" = "auto" ]; then # the default - if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - # sqlite on symbian is typically not build in Qt but deployed as a pre-existing sis file and should be marked as driver. - # Configuration parameters should be set - CFG_SQL_sqlite=qt - QT_LFLAGS_SQLITE=-lsqlite3 - QMAKE_CONFIG="$QMAKE_CONFIG system-sqlite" - fi - fi if [ "$CFG_SQL_sqlite" != "no" ]; then SQLITE_AUTODETECT_FAILED="no" if [ "$CFG_SQLITE" = "system" ]; then @@ -5574,8 +5028,8 @@ fi # auto-detect iconv(3) support if [ "$CFG_ICONV" != "no" ]; then - if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then - CFG_ICONV=no + if [ "$PLATFORM_QWS" = "yes" -o "$XPLATFORM_MINGW" = "yes" ] || [ "$PLATFORM_QPA" = "yes" -a "$CFG_ICONV" = "auto" ]; then + CFG_ICONV=no elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/iconv" "POSIX iconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then CFG_ICONV=yes elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" "$OPT_VERBOSE" "$relpath" "$outpath" "config.tests/unix/sun-libiconv" "SUN libiconv" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then @@ -5620,22 +5074,6 @@ if [ "$CFG_DBUS" != "no" ]; then fi fi -if [ "$CFG_MULTIMEDIA" = "auto" ]; then - CFG_MULTIMEDIA="$CFG_GUI" -fi - -if [ "$CFG_MULTIMEDIA" = "yes" ] && [ "$CFG_GUI" = "no" ]; then - echo "QtMultimedia requested, but it can't be built without QtGui" - exit 1 -fi - -# Generate a CRC of the namespace for using in constants for the Carbon port. -# This should mean that you really *can* load two Qt's and have our custom -# Carbon events work. -if [ "$PLATFORM_MAC" = "yes" -a ! -z "$QT_NAMESPACE" ]; then - QT_NAMESPACE_MAC_CRC=`"$mactests/crc.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/mac/crc $QT_NAMESPACE $L_FLAGS $I_FLAGS $l_FLAGS` -fi - # X11/QWS/Lighthouse if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then @@ -5662,91 +5100,29 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "ye fi fi - if [ "$CFG_GUI" = "no" ]; then - if [ "$CFG_PHONON" = "auto" ]; then - CFG_PHONON=no - fi - if [ "$CFG_PHONON" != "no" ]; then - echo "Phonon enabled, but GUI disabled." - echo " You might need to either enable the GUI or disable Phonon" - exit 1 - 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 - CFG_PHONON=yes - fi - fi - - # auto-detect icd support - if [ "$CFG_GLIB" = "yes" -a "$CFG_ICD" != "no" ]; then + # ### Vestige + if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then - QT_CFLAGS_CONNSETTINGS=`$PKG_CONFIG --cflags connsettings icd2 2>/dev/null` - QT_LIBS_CONNSETTINGS=`$PKG_CONFIG --libs connsettings icd2 2>/dev/null` + 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/icd "ICD" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_CONNSETTINGS $QT_LIBS_CONNSETTINGS; then - [ "$CFG_ICD" = "auto" ] && CFG_ICD=yes - QMakeVar set QT_CFLAGS_CONNSETTINGS "$QT_CFLAGS_CONNSETTINGS" - QMakeVar set QT_LIBS_CONNSETTINGS "$QT_LIBS_CONNSETTINGS" + 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_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 connsettings was not found." + 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_ICD=no + CFG_GSTREAMER=no fi # auto-detect libicu support @@ -5815,9 +5191,9 @@ if [ "$PLATFORM_X11" = "yes" -a "$CFG_GUI" != "no" ]; then fi fi -# X11/MINGW/SYMBIAN OpenGL -if [ "$PLATFORM_X11" = "yes" -o "$XPLATFORM_MINGW" = "yes" -o "$XPLATFORM_SYMBIAN" = "yes" ]; then - # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es2 = OpenGL ES 2.x) +# X11/MINGW OpenGL +if [ "$PLATFORM_X11" = "yes" -o "$XPLATFORM_MINGW" = "yes" ]; then + # auto-detect OpenGL support (es2 = OpenGL ES 2.x) if [ "$CFG_GUI" = "no" ]; then if [ "$CFG_OPENGL" = "auto" ]; then CFG_OPENGL=no @@ -5836,11 +5212,6 @@ if [ "$PLATFORM_X11" = "yes" -o "$XPLATFORM_MINGW" = "yes" -o "$XPLATFORM_SYMBIA if [ "$CFG_EGL" = "no" ]; then CFG_EGL=auto fi - elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then - CFG_OPENGL=es1 - if [ "$CFG_EGL" = "no" ]; then - CFG_EGL=auto - fi else if [ "$CFG_OPENGL" = "yes" ]; then echo "All the OpenGL functionality tests failed!" @@ -5864,16 +5235,6 @@ if [ "$PLATFORM_X11" = "yes" -o "$XPLATFORM_MINGW" = "yes" -o "$XPLATFORM_SYMBIA *) ;; esac - elif [ "$CFG_OPENGL" = "es1" ]; then - # OpenGL ES 1.x - "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS - if [ $? != "0" ]; then - echo "The OpenGL ES 1.x functionality test failed!" - echo " You might need to modify the include and library search paths by editing" - echo " QMAKE_INCDIR_OPENGL_ES1, QMAKE_LIBDIR_OPENGL_ES1 and QMAKE_LIBS_OPENGL_ES1 in" - echo " ${XQMAKESPEC}." - exit 1 - fi elif [ "$CFG_OPENGL" = "es2" ]; then #OpenGL ES 2.x "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS @@ -5906,12 +5267,6 @@ if [ "$PLATFORM_X11" = "yes" -o "$XPLATFORM_MINGW" = "yes" -o "$XPLATFORM_SYMBIA ;; esac fi - - # if opengl is disabled and the user specified graphicssystem gl, disable it... - if [ "$CFG_GRAPHICS_SYSTEM" = "opengl" ] && [ "$CFG_OPENGL" = "no" ]; then - echo "OpenGL Graphics System is disabled due to missing OpenGL support..." - CFG_GRAPHICS_SYSTEM=default - fi fi # X11/MINGW OpenGL # X11 @@ -5990,12 +5345,6 @@ if [ "$PLATFORM_X11" = "yes" ]; then fi fi - # Additional check to decide if WebKit support will be included - if [ "$CFG_XRENDER" = "no" ] && [ "$CFG_WEBKIT" != "no" ]; then - echo "Warning: -no-xrender will disable the QtWebkit module." - CFG_WEBKIT="no" - fi - # auto-detect MIT-SHM support if [ "$CFG_MITSHM" != "no" ]; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/mitshm "mitshm" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then @@ -6189,7 +5538,7 @@ if [ "$PLATFORM_X11" = "yes" ]; then fi # X11 -if [ "$PLATFORM_MAC" = "yes" ]; then +if [ "$BUILD_ON_MAC" = "yes" ]; then if [ "$CFG_PHONON" != "no" ]; then # Always enable Phonon (unless it was explicitly disabled) CFG_PHONON=yes @@ -6206,16 +5555,12 @@ fi if [ "$PLATFORM_QPA" = "yes" ]; then - # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es2 = OpenGL ES 2.x) - if [ "$CFG_ARCH" = "macosx" ]; then - CFG_OPENGL=desktop - elif [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then + # auto-detect OpenGL support (es2 = OpenGL ES 2.x) + if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengldesktop "OpenGL" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then CFG_OPENGL=desktop elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then CFG_OPENGL=es2 - elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then - CFG_OPENGL=es1 else if [ "$CFG_OPENGL" = "yes" ]; then echo "All the OpenGL functionality tests failed!" @@ -6226,16 +5571,6 @@ if [ "$PLATFORM_QPA" = "yes" ]; then fi CFG_OPENGL=no fi - elif [ "$CFG_OPENGL" = "es1" ]; then - # OpenGL ES 1.x - "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS - if [ $? != "0" ]; then - echo "The OpenGL ES 1.x functionality test failed!" - echo " You might need to modify the include and library search paths by editing" - echo " QMAKE_INCDIR_OPENGL_ES1, QMAKE_LIBDIR_OPENGL_ES1 and QMAKE_LIBS_OPENGL_ES1 in" - echo " ${XQMAKESPEC}." - exit 1 - fi elif [ "$CFG_OPENGL" = "es2" ]; then #OpenGL ES 2.x if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists glesv2 2>/dev/null; then @@ -6286,59 +5621,183 @@ if [ "$PLATFORM_QPA" = "yes" ]; then fi - if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists wayland-client 2>/dev/null; then - QMAKE_CFLAGS_WAYLAND=`$PKG_CONFIG --cflags wayland-client 2>/dev/null` - QMAKE_LIBS_WAYLAND=`$PKG_CONFIG --libs wayland-client 2>/dev/null` - QMAKE_INCDIR_WAYLAND=`$PKG_CONFIG --variable=includedir wayland-client 2>/dev/null` - QMAKE_LIBDIR_WAYLAND=`$PKG_CONFIG --variable=libdir wayland-client 2>/dev/null` - fi + # Save these for a check later + ORIG_CFG_WAYLAND="$CFG_WAYLAND" + ORIG_CFG_XCB="$CFG_XCB" - # Detect libxkbcommon - if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists xkbcommon 2>/dev/null; then - QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon 2>/dev/null`" - QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon 2>/dev/null`" - QMAKE_CFLAGS_WAYLAND="$QMAKE_CFLAGS_WAYLAND $QMAKE_CFLAGS_XKBCOMMON" - QMAKE_LIBS_WAYLAND="$QMAKE_LIBS_WAYLAND $QMAKE_LIBS_XKBCOMMON" - QMAKE_CFLAGS_XCB="$QMAKE_CFLAGS_XCB $QMAKE_CFLAGS_XKBCOMMON" - QMAKE_LIBS_XCB="$QMAKE_LIBS_XCB $QMAKE_LIBS_XKBCOMMON" - else - QMAKE_DEFINES_WAYLAND=QT_NO_WAYLAND_XKB - QMAKE_DEFINES_XCB=QT_NO_XCB_XKB + if [ "$CFG_WAYLAND" != "no" ]; then + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists wayland-client 2>/dev/null; then + QMAKE_CFLAGS_WAYLAND=`$PKG_CONFIG --cflags wayland-client 2>/dev/null` + QMAKE_LIBS_WAYLAND=`$PKG_CONFIG --libs wayland-client 2>/dev/null` + QMAKE_INCDIR_WAYLAND=`$PKG_CONFIG --variable=includedir wayland-client 2>/dev/null` + QMAKE_LIBDIR_WAYLAND=`$PKG_CONFIG --variable=libdir wayland-client 2>/dev/null` + fi + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/wayland "Wayland" $L_FLAGS $I_FLAGS $l_FLAGS $QMAKE_CFLAGS_WAYLAND $QMAKE_LIBS_WAYLAND; then + CFG_WAYLAND=yes + QT_CONFIG="$QT_CONFIG wayland" + elif [ "$CFG_WAYLAND" = "yes" ]; then + echo "The Wayland functionality test failed!" + exit 1 + else + CFG_WAYLAND=no + QMakeVar add DEFINES QT_NO_WAYLAND + fi fi - # QMake variables set here override those in the mkspec. Therefore we only set the variables here if they are not zero. - if [ -n "$QMAKE_CFLAGS_WAYLAND" ] || [ -n "$QMAKE_LIBS_WAYLAND" ]; then - QMakeVar set QMAKE_CFLAGS_WAYLAND "$QMAKE_CFLAGS_WAYLAND" - QMakeVar set QMAKE_INCDIR_WAYLAND "$QMAKE_INCDIR_WAYLAND" - QMakeVar set QMAKE_LIBS_WAYLAND "$QMAKE_LIBS_WAYLAND" - QMakeVar set QMAKE_LIBDIR_WAYLAND "$QMAKE_LIBDIR_WAYLAND" - QMakeVar set QMAKE_DEFINES_WAYLAND " $QMAKE_DEFINES_WAYLAND" + if [ "$CFG_LIBUDEV" != "no" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/libudev "libudev" $L_FLAGS $I_FLAGS $l_FLAGS; then + CFG_LIBUDEV=yes + QT_CONFIG="$QT_CONFIG libudev" + elif [ "$CFG_LIBUDEV" = "yes" ]; then + echo "The libudev functionality test failed!" + exit 1 + else + CFG_LIBUDEV=no + QMakeVar add DEFINES QT_NO_LIBUDEV + fi fi - if [ -n "$QMAKE_CFLAGS_XCB" ] || [ -n "$QMAKE_LIBS_XCB" ]; then - QMakeVar set QMAKE_CFLAGS_XCB "$QMAKE_CFLAGS_XCB" - QMakeVar set QMAKE_LIBS_XCB "$QMAKE_LIBS_XCB" - QMakeVar set QMAKE_DEFINES_XCB "$QMAKE_DEFINES_XCB" + if [ "$CFG_EVDEV" != "no" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/evdev "evdev" $L_FLAGS $I_FLAGS $l_FLAGS; then + CFG_EVDEV=yes + QT_CONFIG="$QT_CONFIG evdev" + elif [ "$CFG_EVDEV" = "yes" ]; then + echo "The evdev functionality test failed!" + exit 1 + else + CFG_EVDEV=no + QMakeVar add DEFINES QT_NO_EVDEV + fi fi - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/wayland "Wayland" $L_FLAGS $I_FLAGS $l_FLAGS $QMAKE_CFLAGS_WAYLAND $QMAKE_LIBS_WAYLAND; then - QT_CONFIG="$QT_CONFIG wayland" + # Check we actually have X11 :-) + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xlib "XLib" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + QT_CONFIG="$QT_CONFIG xlib" fi - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/mac/coreservices "CoreServices" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then - QT_CONFIG="$QT_CONFIG coreservices" - else - QMakeVar add DEFINES QT_NO_CORESERVICES + # auto-detect Xrender support + if [ "$CFG_XRENDER" != "no" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xrender "Xrender" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + CFG_XRENDER=yes + QT_CONFIG="$QT_CONFIG xrender" + else + if [ "$CFG_XRENDER" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then + echo "Xrender 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_XRENDER=no + fi + fi fi -fi + if [ "$CFG_XCB" != "no" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/xcb "xcb" $L_FLAGS $I_FLAGS $l_FLAGS; then + CFG_XCB=yes + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/xcb-render "xcb-render" $L_FLAGS $I_FLAGS $l_FLAGS; then + QT_CONFIG="$QT_CONFIG xcb-render" + fi + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/xcb-poll-for-queued-event "xcb-poll-for-queued-event" $L_FLAGS $I_FLAGS $l_FLAGS; then + CFG_XCB_LIMITED=no + QT_CONFIG="$QT_CONFIG xcb-poll-for-queued-event" + fi -# QWS -if [ "$PLATFORM_QWS" = "yes" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qpa/xcb-xlib "xcb-xlib" $L_FLAGS $I_FLAGS $l_FLAGS; then + QT_CONFIG="$QT_CONFIG xcb-xlib" + fi - # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es2 = OpenGL ES 2.x) - if [ "$CFG_GUI" = "no" ]; then + if [ "$XPLATFORM_MAEMO" = "yes" ]; then + # auto-detect XInput2/Xinput support + if [ "$CFG_XINPUT2" != "no" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xinput2 "XInput2" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + CFG_XINPUT2=yes + CFG_XINPUT=no + else + if [ "$CFG_XINPUT2" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then + echo "XInput2 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_XINPUT2=no + fi + fi + fi + fi + else + if [ "$CFG_XCB" = "yes" ]; then + echo "The XCB test failed!" + echo " You might need to install dependency packages." + echo " See src/plugins/platforms/xcb/README." + exit 1 + fi + CFG_XCB=no + QMakeVar add DEFINES QT_NO_XCB + fi + fi + + # Detect libxkbcommon + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists xkbcommon 2>/dev/null; then + QMAKE_CFLAGS_XKBCOMMON="`$PKG_CONFIG --cflags xkbcommon 2>/dev/null`" + QMAKE_LIBS_XKBCOMMON="`$PKG_CONFIG --libs xkbcommon 2>/dev/null`" + if [ "$CFG_WAYLAND" = "yes" ]; then + QMAKE_CFLAGS_WAYLAND="$QMAKE_CFLAGS_WAYLAND $QMAKE_CFLAGS_XKBCOMMON" + QMAKE_LIBS_WAYLAND="$QMAKE_LIBS_WAYLAND $QMAKE_LIBS_XKBCOMMON" + fi + QMAKE_CFLAGS_XCB="$QMAKE_CFLAGS_XCB $QMAKE_CFLAGS_XKBCOMMON" + QMAKE_LIBS_XCB="$QMAKE_LIBS_XCB $QMAKE_LIBS_XKBCOMMON" + else + if [ "$CFG_WAYLAND" = "yes" ]; then + QMAKE_DEFINES_WAYLAND=QT_NO_WAYLAND_XKB + fi + QMAKE_DEFINES_XCB=QT_NO_XCB_XKB + fi + + # QMake variables set here override those in the mkspec. Therefore we only set the variables here if they are not zero. + if [ -n "$QMAKE_CFLAGS_WAYLAND" ] || [ -n "$QMAKE_LIBS_WAYLAND" ]; then + QMakeVar set QMAKE_CFLAGS_WAYLAND "$QMAKE_CFLAGS_WAYLAND" + QMakeVar set QMAKE_INCDIR_WAYLAND "$QMAKE_INCDIR_WAYLAND" + QMakeVar set QMAKE_LIBS_WAYLAND "$QMAKE_LIBS_WAYLAND" + QMakeVar set QMAKE_LIBDIR_WAYLAND "$QMAKE_LIBDIR_WAYLAND" + QMakeVar set QMAKE_DEFINES_WAYLAND " $QMAKE_DEFINES_WAYLAND" + fi + + if [ -n "$QMAKE_CFLAGS_XCB" ] || [ -n "$QMAKE_LIBS_XCB" ]; then + QMakeVar set QMAKE_CFLAGS_XCB "$QMAKE_CFLAGS_XCB" + QMakeVar set QMAKE_LIBS_XCB "$QMAKE_LIBS_XCB" + QMakeVar set QMAKE_DEFINES_XCB "$QMAKE_DEFINES_XCB" + fi + + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/mac/coreservices "CoreServices" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then + QT_CONFIG="$QT_CONFIG coreservices" + else + QMakeVar add DEFINES QT_NO_CORESERVICES + fi + + if [ "$PLATFORM_QPA" = "yes" ] && [ "$BUILD_ON_MAC" = "no" ] && [ "$XPLATFORM_MINGW" = "no" ]; then + if [ "$CFG_XCB" = "no" ] && [ "$CFG_WAYLAND" = "no" ]; then + if [ "$ORIG_CFG_XCB" = "auto" ] || [ "$ORIG_CFG_WAYLAND" = "auto" ]; then + echo "No QPA platform plugin enabled!" + echo " If you really want to build without a QPA platform plugin you must pass" + echo " -no-xcb and -no-wayland to configure. Doing this will produce a Qt that" + echo " cannot run GUI applications." + exit 1 + fi + fi + fi + +fi + + +# QWS +if [ "$PLATFORM_QWS" = "yes" ]; then + + # auto-detect OpenGL support (es2 = OpenGL ES 2.x) + if [ "$CFG_GUI" = "no" ]; then if [ "$CFG_OPENGL" = "auto" ]; then CFG_OPENGL=no fi @@ -6352,26 +5811,7 @@ if [ "$PLATFORM_QWS" = "yes" ]; then CFG_EGL=auto if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS; then CFG_OPENGL=es2 - elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS; then - CFG_OPENGL=es1 - else - echo "All the OpenGL ES functionality tests failed!" - echo " You might need to modify the include and library search paths by editing" - echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" - echo " ${XQMAKESPEC}." - exit 1 - fi - elif [ "$CFG_OPENGL" = "es1" ]; then - # OpenGL ES 1.x - "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles1 "OpenGL ES 1.x" $L_FLAGS $I_FLAGS $l_FLAGS - if [ $? != "0" ]; then - echo "The OpenGL ES 1.x functionality test failed!" - echo " You might need to modify the include and library search paths by editing" - echo " QMAKE_INCDIR_OPENGL, QMAKE_LIBDIR_OPENGL and QMAKE_LIBS_OPENGL in" - echo " ${XQMAKESPEC}." - exit 1 fi - CFG_EGL=yes elif [ "$CFG_OPENGL" = "es2" ]; then #OpenGL ES 2.x "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/opengles2 "OpenGL ES 2.x" $L_FLAGS $I_FLAGS $l_FLAGS @@ -6430,9 +5870,6 @@ if [ "$PLATFORM_QWS" = "yes" ]; then QMakeVar set QT_CFLAGS_DIRECTFB "$QT_CFLAGS_DIRECTFB" QMakeVar set QT_LIBS_DIRECTFB "$QT_LIBS_DIRECTFB" fi - if [ "$CFG_QT3SUPPORT" = "yes" ]; then - QMakeVar set QT_DEFINES_DIRECTFB "QT3_SUPPORT" - fi "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/qws/directfb "DirectFB" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_DIRECTFB $QT_LIBS_DIRECTFB if [ $? != "0" ]; then @@ -6481,16 +5918,6 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then CFG_EGL=yes fi - # Prefer this variant for ES1 - if [ "$CFG_OPENGL" = "es1" -o "$EGL_VARIANT" = "none" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/egl4gles1" "EGL (GLES/egl.h)" $L_FLAGS $I_FLAGS $l_FLAGS; then - # EGL specified by QMAKE_*_EGL, included with - EGL_VARIANT=gles - CFG_EGL=yes - CFG_EGL_GLES_INCLUDES=yes - fi - fi - if [ "$EGL_VARIANT" = "none" ]; then if [ "$CFG_EGL" = "yes" ]; then echo "The EGL functionality test failed!" @@ -6502,7 +5929,7 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then fi CFG_EGL=no # If QtOpenGL would be built against OpenGL ES, disable it as we can't to that if EGL is missing - if [ "$CFG_OPENGL" = "es1" -o "$CFG_OPENGL" = "es2" ]; then + if [ "$CFG_OPENGL" = "es2" ]; then CFG_OPENGL=no fi fi @@ -6513,7 +5940,6 @@ fi # freetype support [ "x$CFG_EMBEDDED" != "xno" ] && CFG_LIBFREETYPE="$CFG_QWS_FREETYPE" -[ "x$PLATFORM_MAC" = "xyes" ] && CFG_LIBFREETYPE=no [ "$XPLATFORM_MINGW" = "yes" ] && [ "$CFG_LIBFREETYPE" = "auto" ] && CFG_LIBFREETYPE=no if [ "$CFG_LIBFREETYPE" = "auto" ]; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/freetype "FreeType" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then @@ -6526,12 +5952,10 @@ fi if [ "$CFG_ENDIAN" = "auto" ]; then if [ "$XPLATFORM_MINGW" = "yes" ]; then CFG_ENDIAN="Q_LITTLE_ENDIAN" - elif [ "$XPLATFORM_SYMBIAN_SBSV2" = "yes" ]; then - CFG_ENDIAN="Q_LITTLE_ENDIAN" - elif [ "$PLATFORM_MAC" = "yes" ] && [ "$XPLATFORM_SYMBIAN" = "no" ]; then + elif [ "$BUILD_ON_MAC" = "yes" ]; then true #leave as auto else - "$unixtests/endian.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" + "$unixtests/endian.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" "QMAKE_LFLAGS+=$SYSROOT_FLAG" F="$?" if [ "$F" -eq 0 ]; then CFG_ENDIAN="Q_LITTLE_ENDIAN" @@ -6549,7 +5973,7 @@ if [ "$CFG_ENDIAN" = "auto" ]; then fi if [ "$CFG_HOST_ENDIAN" = "auto" ]; then - if [ "$PLATFORM_MAC" = "yes" ]; then + if [ "$BUILD_ON_MAC" = "yes" ]; then true #leave as auto else "$unixtests/endian.test" "$QMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" @@ -6615,7 +6039,7 @@ if [ "$CFG_DOUBLEFORMAT" = "auto" ]; then fi HAVE_STL=no -if [ "$XPLATFORM_SYMBIAN" = "yes" ] || "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then +if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/stl "STL" $L_FLAGS $I_FLAGS $l_FLAGS; then HAVE_STL=yes fi @@ -6635,26 +6059,6 @@ if [ "$CFG_STL" != "no" ]; then fi fi -# find if the platform supports IPv6 -if [ "$CFG_IPV6" != "no" ]; then - if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - #IPV6 should always be enabled for Symbian release - CFG_IPV6=yes - 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!" - 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_IPV6=no - fi - fi -fi - # detect POSIX clock_gettime() if [ "$CFG_CLOCK_GETTIME" = "auto" ]; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/clock-gettime "POSIX clock_gettime()" $L_FLAGS $I_FLAGS $l_FLAGS; then @@ -6753,7 +6157,7 @@ if [ "$CFG_GETIFADDRS" != "no" ]; then fi # detect OpenSSL -if [ "$CFG_OPENSSL" != "no" ] && [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then +if [ "$CFG_OPENSSL" != "no" ]; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/openssl "OpenSSL" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then if [ "$CFG_OPENSSL" = "auto" ]; then CFG_OPENSSL=yes @@ -6769,15 +6173,27 @@ if [ "$CFG_OPENSSL" != "no" ] && [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then CFG_OPENSSL=no fi fi -else - if [ "$CFG_OPENSSL" = "auto" ] && [ "$XPLATFORM_SYMBIAN_SBSV2" = "yes" ]; then - #OpenSSl should be enabled for Symbian release - CFG_OPENSSL=yes +fi + +# detect PCRE +if [ "$CFG_PCRE" != "qt" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/pcre "PCRE" $L_FLAGS $I_FLAGS $l_FLAGS; then + CFG_PCRE=system + else + if [ "$CFG_PCRE" = "system" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then + echo "PCRE support cannot be enabled due to functionality tests!" + echo " Turn on verbose messaging (-v) to $0 to see the final report." + echo " If you believe this message is in error you may use the continue" + echo " switch (-continue) to $0 to continue." + exit 101 + else + CFG_PCRE=qt + fi fi fi # detect OpenVG support -if [ "$CFG_OPENVG" != "no" ] && [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then +if [ "$CFG_OPENVG" != "no" ]; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/openvg" "OpenVG" $L_FLAGS $I_FLAGS $l_FLAGS $CONFIG_ARG; then if [ "$CFG_OPENVG" = "auto" ]; then CFG_OPENVG=yes @@ -6814,35 +6230,12 @@ if [ "$CFG_OPENVG" != "no" ] && [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; then fi fi -# 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..." - (cd "$relpath/src/3rdparty/ptmalloc/"; "$MAKE" "clean" ; "$MAKE" "posix" - mkdir "$outpath/lib/" ; cp "libptmalloc3.a" "$outpath/lib/") - - QMakeVar add QMAKE_LFLAGS "$outpath/lib/libptmalloc3.a" -fi - -if [ "$CFG_ALSA" = "auto" ] && [ "$XPLATFORM_SYMBIAN_SBSV2" = "no" ]; 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 -elif [ "$XPLATFORM_SYMBIAN_SBSV2" = "yes" ]; then - # Disabled for Symbian release - CFG_ALSA=no fi if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ] || [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" ]; then @@ -6853,9 +6246,6 @@ if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ] || [ "$CFG_JAVASCRIPTCORE_JIT" = "auto" fi else case "$XPLATFORM" in - symbian-gcce) - CFG_JAVASCRIPTCORE_JIT=no - ;; linux-icc*) CFG_JAVASCRIPTCORE_JIT=no ;; @@ -6870,21 +6260,12 @@ elif [ "$CFG_JAVASCRIPTCORE_JIT" = "no" ]; then fi if [ "$CFG_AUDIO_BACKEND" = "auto" ]; then - if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - if "$symbiantests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/symbian/audio "audio" $L_FLAGS $I_FLAGS $l_FLAGS ; then - CFG_AUDIO_BACKEND=yes - fi - else - CFG_AUDIO_BACKEND=yes - fi + CFG_AUDIO_BACKEND=yes fi if [ "$CFG_LARGEFILE" != "yes" ] && [ "$XPLATFORM_MINGW" = "yes" ]; then echo "Warning: largefile support cannot be disabled for win32." CFG_LARGEFILE="yes" -elif [ "$CFG_LARGEFILE" != "no" ] && [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - echo "Warning: largefile support cannot be enabled for symbian." - CFG_LARGEFILE="no" fi #------------------------------------------------------------------------------- @@ -6936,89 +6317,15 @@ if [ "$CFG_MAC_DWARF2" = "yes" ]; then fi # Set the default arch if there are no "-arch" arguments on the configure line -# For "-carbon" builds: 32 bit x86/ppc. -# For builds on snow leopard : compiler default (64-bit). -# For builds on leopard : compiler default (32-bit). if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_ARCHS" = "" ]; then source "$mactests/defaultarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" - - if [ "$CFG_MAC_CARBON" = "yes" ]; then - if [ "$QT_MAC_DEFAULT_ARCH" = "x86_64" ]; then - CFG_MAC_ARCHS=" x86" - elif [ "$QT_MAC_DEFAULT_ARCH" = "ppc64" ]; then - CFG_MAC_ARCHS=" ppc" - else - CFG_MAC_ARCHS=" $QT_MAC_DEFAULT_ARCH" - fi - else - CFG_MAC_ARCHS=" $QT_MAC_DEFAULT_ARCH" - fi - + CFG_MAC_ARCHS=" $QT_MAC_DEFAULT_ARCH" [ "$OPT_VERBOSE" = "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS." fi -# enable Cocoa and/or Carbon on Mac -# -carbon on the command line disables Cocoa, except for 64-bit archs -if [ "$CFG_MAC_CARBON" = "yes" ]; then - CFG_MAC_CARBON="YES" - CFG_MAC_COCOA="NO" - -# check which archs are in use, enable cocoa if we find a 64-bit one - if echo "$CFG_MAC_ARCHS" | grep 64 > /dev/null 2>&1; then - CFG_MAC_COCOA="yes"; - CFG_MAC_CARBON="no"; - if echo "$CFG_MAC_ARCHS" | grep -w ppc > /dev/null 2>&1; then - CFG_MAC_CARBON="yes"; - fi - if echo "$CFG_MAC_ARCHS" | grep -w x86 > /dev/null 2>&1; then - CFG_MAC_CARBON="yes"; - fi - fi -fi - -# select Carbon on 10.4 Tiger. -if [ "$PLATFORM_MAC" = "yes" ]; then - VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'` - if [ "$VERSION" == 8 ]; then - CFG_MAC_COCOA="no"; - CFG_MAC_CARBON="yes"; - fi -fi - -# select Carbon when using the 10.4u SDK -if [ "$PLATFORM_MAC" = "yes" ]; then - if [ "TEST$CFG_SDK" = "TEST/Developer/SDKs/MacOSX10.4u.sdk/" ]; then - echo "Carbon on"; - CFG_MAC_COCOA="no"; - CFG_MAC_CARBON="yes"; - fi -fi - -# but disable Cocoa if cross-building for mingw and symbian -[ "$XPLATFORM_MINGW" = "yes" ] && CFG_MAC_COCOA="no" -[ "$XPLATFORM_SYMBIAN" = "yes" ] && CFG_MAC_COCOA="no" - -# disable Qt 3 support on VxWorks and Symbian -case "$XPLATFORM" in - unsupported/vxworks*|symbian*) - CFG_QT3SUPPORT="no" - ;; -esac - -# enable Qt 3 support functionality -if [ "$CFG_QT3SUPPORT" = "yes" ]; then - QT_CONFIG="$QT_CONFIG gui-qt3support" -fi - -# enable Phonon -if [ "$CFG_PHONON" = "yes" ]; then - # No longer needed after modularization - #QT_CONFIG="$QT_CONFIG phonon" - if [ "$CFG_PHONON_BACKEND" = "yes" ]; then - QT_CONFIG="$QT_CONFIG phonon-backend" - fi -else - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PHONON" +# ### Vestige +if [ "$CFG_PHONON_BACKEND" = "yes" ]; then + QT_CONFIG="$QT_CONFIG phonon-backend" fi # disable accessibility @@ -7060,19 +6367,6 @@ else fi fi -if [ "$CFG_QS60STYLE" = "no" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_S60" -else - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_STYLE_S60" -fi - -# Just check if OpenGL is not set by command argumets for Symbian. -if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - if [ "$CFG_OPENGL" = "auto" ]; then - CFG_OPENGL="no" - fi -fi - # enable opengl if [ "$CFG_OPENGL" = "no" ]; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENGL" @@ -7080,18 +6374,10 @@ else QT_CONFIG="$QT_CONFIG opengl" fi -if [ "$CFG_OPENGL" = "es1" ] || [ "$CFG_OPENGL" = "es2" ]; then - if [ "$PLATFORM_QWS" = "yes" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS Q_BACKINGSTORE_SUBSURFACES" - fi +if [ "$CFG_OPENGL" = "es2" ]; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES" fi -if [ "$CFG_OPENGL" = "es1" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES_1" - QT_CONFIG="$QT_CONFIG opengles1" -fi - if [ "$CFG_OPENGL" = "es2" ]; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES_2" QT_CONFIG="$QT_CONFIG opengles2" @@ -7162,10 +6448,10 @@ fi if [ "$CFG_SEPARATE_DEBUG_INFO" = "yes" ]; then QMakeVar add QMAKE_CFLAGS -g QMakeVar add QMAKE_CXXFLAGS -g - QMAKE_CONFIG="$QMAKE_CONFIG separate_debug_info" + QT_CONFIG="$QT_CONFIG separate_debug_info" fi if [ "$CFG_SEPARATE_DEBUG_INFO_NOCOPY" = "yes" ] ; then - QMAKE_CONFIG="$QMAKE_CONFIG separate_debug_info_nocopy" + QT_CONFIG="$QT_CONFIG separate_debug_info_nocopy" fi [ "$CFG_MMX" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG mmx" [ "$CFG_3DNOW" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG 3dnow" @@ -7179,9 +6465,6 @@ fi [ "$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 QT_CONFIG="$QT_CONFIG clock-gettime" fi @@ -7213,16 +6496,6 @@ if [ "$CFG_JPEG" = "no" ]; then elif [ "$CFG_JPEG" = "yes" ]; then QT_CONFIG="$QT_CONFIG jpeg" fi -if [ "$CFG_LIBMNG" = "no" ]; then - CFG_MNG="no" -elif [ "$CFG_LIBMNG" = "system" ]; then - QT_CONFIG="$QT_CONFIG system-mng" -fi -if [ "$CFG_MNG" = "no" ]; then - QT_CONFIG="$QT_CONFIG no-mng" -elif [ "$CFG_MNG" = "yes" ]; then - QT_CONFIG="$QT_CONFIG mng" -fi if [ "$CFG_LIBPNG" = "no" ]; then CFG_PNG="no" fi @@ -7239,16 +6512,6 @@ if [ "$CFG_GIF" = "no" ]; then elif [ "$CFG_GIF" = "yes" ]; then QT_CONFIG="$QT_CONFIG gif" fi -if [ "$CFG_LIBTIFF" = "no" ]; then - CFG_TIFF="no" -elif [ "$CFG_LIBTIFF" = "system" ]; then - QT_CONFIG="$QT_CONFIG system-tiff" -fi -if [ "$CFG_TIFF" = "no" ]; then - QT_CONFIG="$QT_CONFIG no-tiff" -elif [ "$CFG_TIFF" = "yes" ]; then - QT_CONFIG="$QT_CONFIG tiff" -fi if [ "$CFG_LIBFREETYPE" = "no" ]; then QT_CONFIG="$QT_CONFIG no-freetype" QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_FREETYPE" @@ -7267,7 +6530,7 @@ else fi -if [ "x$PLATFORM_MAC" = "xyes" ] && [ "$XPLATFORM_MINGW" != "yes" ] && [ "$XPLATFORM_SYMBIAN" != "yes" ]; then +if [ "x$BUILD_ON_MAC" = "xyes" ] && [ "$XPLATFORM_MINGW" != "yes" ]; then #On Mac we implicitly link against libz, so we #never use the 3rdparty stuff. [ "$CFG_ZLIB" = "yes" ] && CFG_ZLIB="system" @@ -7278,16 +6541,6 @@ elif [ "$CFG_ZLIB" = "system" ]; then QT_CONFIG="$QT_CONFIG system-zlib" fi -if [ "$CFG_S60" = "yes" ]; then - QT_CONFIG="$QT_CONFIG s60" -fi - -if [ "$CFG_SYMBIAN_DEFFILES" = "yes" ]; then - QTCONFIG_CONFIG="$QTCONFIG_CONFIG def_files" -else - QTCONFIG_CONFIG="$QTCONFIG_CONFIG def_files_disabled" -fi - [ "$CFG_NIS" = "yes" ] && QT_CONFIG="$QT_CONFIG nis" [ "$CFG_CUPS" = "yes" ] && QT_CONFIG="$QT_CONFIG cups" [ "$CFG_ICONV" = "yes" ] && QT_CONFIG="$QT_CONFIG iconv" @@ -7302,6 +6555,7 @@ fi [ "$CFG_OPENSSL" = "linked" ] && QT_CONFIG="$QT_CONFIG openssl-linked" [ "$CFG_MAC_HARFBUZZ" = "yes" ] && QT_CONFIG="$QT_CONFIG harfbuzz" [ "$CFG_XCB" = "yes" ] && QT_CONFIG="$QT_CONFIG xcb" +[ "$CFG_XINPUT2" = "yes" ] && QT_CONFIG="$QT_CONFIG xinput2" if [ "$PLATFORM_X11" = "yes" ]; then [ "$CFG_SM" = "yes" ] && QT_CONFIG="$QT_CONFIG x11sm" @@ -7363,7 +6617,7 @@ fi [ '!' -z "$L_FLAGS" ] && QMakeVar add QMAKE_LIBDIR_FLAGS "$L_FLAGS" [ '!' -z "$l_FLAGS" ] && QMakeVar add LIBS "$l_FLAGS" -if [ "$CFG_ARCH" = "macosx" ]; then +if [ "$PLATFORM_MAC" = "yes" ]; then if [ "$CFG_RPATH" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG absolute_library_soname" fi @@ -7395,8 +6649,15 @@ if [ '!' -z "$I_FLAGS" ]; then QMakeVar add QMAKE_CXXFLAGS "$I_FLAGS" fi +if [ '!' -z "$W_FLAGS" ]; then + # add the user defined warning flags + QMakeVar add QMAKE_CFLAGS_WARN_ON "$W_FLAGS" + QMakeVar add QMAKE_CXXFLAGS_WARN_ON "$W_FLAGS" + QMakeVar add QMAKE_OBJECTIVE_CFLAGS_WARN_ON "$W_FLAGS" +fi + # turn off exceptions for the compilers that support it -if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then +if [ "$PLATFORM_QWS" = "yes" ]; then COMPILER=`echo $XPLATFORM | cut -f 3- -d-` elif [ "$XPLATFORM" != "$PLATFORM" ]; then COMPILER=`echo $XPLATFORM | cut -f 2- -d-` @@ -7429,14 +6690,18 @@ if [ "$CFG_COREWLAN" = "yes" ]; then QT_CONFIG="$QT_CONFIG corewlan" fi -if [ "$CFG_ICD" = "yes" ]; then - QT_CONFIG="$QT_CONFIG icd" -fi - if [ "$CFG_ICU" = "yes" ]; then QT_CONFIG="$QT_CONFIG icu" fi +if [ "$CFG_FORCE_ASSERTS" = "yes" ]; then + QT_CONFIG="$QT_CONFIG force_asserts" +fi + +if [ "$CFG_PCRE" = "qt" ]; then + QMAKE_CONFIG="$QMAKE_CONFIG pcre" +fi + # # Some Qt modules are too advanced in C++ for some old compilers # Detect here the platforms where they are known to work. @@ -7444,15 +6709,8 @@ fi # See Qt documentation for more information on which features are # supported and on which compilers. # -canBuildQtXmlPatterns="yes" -canBuildWebKit="$HAVE_STL" canBuildQtConcurrent="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 +canUseV8Snapshot="yes" case "$XPLATFORM" in hpux-g++*) @@ -7555,10 +6813,6 @@ EOF canBuildWebKit="no" canBuildQtConcurrent="no" ;; - symbian-gcce) - ;; - symbian-armcc) - ;; esac if [ "$CFG_GUI" = "no" ]; then @@ -7577,137 +6831,50 @@ CFG_CONCURRENT="yes" if [ "$canBuildQtConcurrent" = "no" ]; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CONCURRENT" CFG_CONCURRENT="no" +else + QT_CONFIG="$QT_CONFIG concurrent" fi -if [ "$CFG_XMLPATTERNS" = "yes" -a "$CFG_EXCEPTIONS" = "no" ]; then - echo "QtXmlPatterns was requested, but it can't be built due to exceptions being disabled." - exit 1 -fi -if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then - CFG_XMLPATTERNS="$canBuildQtXmlPatterns" -elif [ "$CFG_EXCEPTIONS" = "no" ]; then - CFG_XMLPATTERNS="no" -fi -# No longer needed after modularization -#if [ "$CFG_XMLPATTERNS" = "yes" ]; then -# QT_CONFIG="$QT_CONFIG xmlpatterns" -#else -# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XMLPATTERNS" -#fi - -# No longer needed after modularization -#if [ "$CFG_MULTIMEDIA" = "no" ]; then -# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MULTIMEDIA" -#else -# QT_CONFIG="$QT_CONFIG multimedia" -#fi - +# ### Vestige if [ "$CFG_AUDIO_BACKEND" = "yes" ]; then QT_CONFIG="$QT_CONFIG audio-backend" fi -if [ "$CFG_SVG" = "auto" ]; then - CFG_SVG=$CFG_GUI -fi - -if [ "$CFG_SVG" = "yes" ] && [ "$CFG_GUI" = "no" ]; then - echo "QtSvg requested, but it can't be built without QtGui" - exit 1 -fi - -if [ "$CFG_SVG" = "yes" ]; then - QT_CONFIG="$QT_CONFIG svg" -else - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SVG" -fi - -if [ "$CFG_WEBKIT" != "no" ]; then - CFG_WEBKIT="$canBuildWebKit" -fi - -if [ "$CFG_WEBKIT" != "no" ]; then - # No longer needed after modularization - #QT_CONFIG="$QT_CONFIG webkit" - # The reason we set CFG_WEBKIT, is such that the printed overview of what will be enabled, shows correctly. - if [ "$CFG_WEBKIT" = "debug" ]; then - QMAKE_CONFIG="$QMAKE_CONFIG webkit-debug" - fi -fi - -if [ "$CFG_SCRIPT" = "auto" ]; then - CFG_SCRIPT="yes" +# ### Vestige +if [ "$CFG_WEBKIT" = "debug" ]; then + QMAKE_CONFIG="$QMAKE_CONFIG webkit-debug" fi -# No longer needed after modularization -#if [ "$CFG_SCRIPT" = "yes" ]; then -# QT_CONFIG="$QT_CONFIG script" -#else -# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPT" -#fi - -if [ "$CFG_SCRIPTTOOLS" = "yes" -a "$CFG_SCRIPT" = "no" ]; then - echo "QtScriptTools was requested, but it can't be built due to QtScript being disabled." - exit 1 -fi -if [ "$CFG_SCRIPTTOOLS" = "auto" -a "$CFG_SCRIPT" != "no" ]; then - case "$XPLATFORM" in - symbian*) - CFG_SCRIPTTOOLS="no" +# ### Vestige +QT_CONFIG="$QT_CONFIG v8" +# Detect snapshot support +if [ "$CFG_ARCH" != "$CFG_HOST_ARCH" ]; then + case "$CFG_HOST_ARCH,$CFG_ARCH" in + i386,arm) ;; - *) - CFG_SCRIPTTOOLS="yes" + *) canUseV8Snapshot="no" ;; esac -elif [ "$CFG_SCRIPT" = "no" ]; then - CFG_SCRIPTTOOLS="no" -fi - -# No longer needed after modularization -#if [ "$CFG_SCRIPTTOOLS" = "yes" ]; then -# QT_CONFIG="$QT_CONFIG scripttools" -#else -# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SCRIPTTOOLS" -#fi - - -if [ "$CFG_DECLARATIVE" = "yes" ]; then - if [ "$CFG_SCRIPT" = "no" -o "$CFG_GUI" = "no" ]; then - echo "Error: QtDeclarative was requested, but it can't be built due to QtScript or QtGui being disabled." - exit 1 - fi -fi -if [ "$CFG_DECLARATIVE" = "auto" ]; then - if [ "$CFG_SCRIPT" = "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" + 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_LOCATION" = "auto" ]; then - CFG_LOCATION="$CFG_GUI" +if [ "$CFG_V8SNAPSHOT" = "auto" ]; then + CFG_V8SNAPSHOT="$canUseV8Snapshot" fi - -if [ "$CFG_LOCATION" = "yes" ] && [ "$CFG_GUI" = "no" ]; then - echo "QtLocation requested, but it can't be built without QtGui" +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 -#Disable QtLocation until ready -CFG_LOCATION="no" - -if [ "$CFG_LOCATION" = "no" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_LOCATION" +# ### Vestige +if [ "$CFG_DECLARATIVE_DEBUG" = "no" ]; then + QCONFIG_FLAGS="$QCONFIG_FLAGS QDECLARATIVE_NO_DEBUG_PROTOCOL" fi if [ "$CFG_EXCEPTIONS" = "no" ]; then @@ -7732,42 +6899,6 @@ if [ "$CFG_EXCEPTIONS" = "no" ]; then QMAKE_CONFIG="$QMAKE_CONFIG exceptions_off" fi -# On Mac, set the minimum deployment target for the different architechtures -# using the Xarch compiler option when supported (10.5 and up). -if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" != "no" ] ; then - if echo "$CFG_MAC_ARCHS" | grep '\' > /dev/null 2>&1; then - QMakeVar add QMAKE_CFLAGS "-Xarch_i386 -mmacosx-version-min=10.4" - QMakeVar add QMAKE_CXXFLAGS "-Xarch_i386 -mmacosx-version-min=10.4" - QMakeVar add QMAKE_LFLAGS "-Xarch_i386 -mmacosx-version-min=10.4" - QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86 "-arch i386 -Xarch_i386 -mmacosx-version-min=10.4" - fi - if echo "$CFG_MAC_ARCHS" | grep '\' > /dev/null 2>&1; then - QMakeVar add QMAKE_CFLAGS "-Xarch_ppc -mmacosx-version-min=10.4" - QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc -mmacosx-version-min=10.4" - QMakeVar add QMAKE_LFLAGS "-Xarch_ppc -mmacosx-version-min=10.4" - QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC "-arch ppc -Xarch_ppc -mmacosx-version-min=10.4" - fi - if echo "$CFG_MAC_ARCHS" | grep '\' > /dev/null 2>&1; then - QMakeVar add QMAKE_CFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5" - QMakeVar add QMAKE_CXXFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5" - QMakeVar add QMAKE_LFLAGS "-Xarch_x86_64 -mmacosx-version-min=10.5" - QMakeVar add QMAKE_OBJECTIVE_CFLAGS_X86_64 "-arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5" - fi - if echo "$CFG_MAC_ARCHS" | grep '\' > /dev/null 2>&1; then - QMakeVar add QMAKE_CFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5" - QMakeVar add QMAKE_CXXFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5" - QMakeVar add QMAKE_LFLAGS "-Xarch_ppc64 -mmacosx-version-min=10.5" - QMakeVar add QMAKE_OBJECTIVE_CFLAGS_PPC_64 "-arch ppc64 -Xarch_ppc64 -mmacosx-version-min=10.5" - fi -fi - -#------------------------------------------------------------------------------- -# 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++ @@ -7786,201 +6917,12 @@ g++*) ;; esac - case "$COMPILER_VERSION" in - 2.95.*) - COMPILER_VERSION="2.95.*" - ;; - 3.*) - COMPILER_VERSION="3.*" - ;; - 4.*) - COMPILER_VERSION="4" - ;; - *) - ;; - 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 - COMPAT_COMPILER="icc" - COMPILER="g++-4" - case "`g++ -dumpversion` 2>/dev/null" in - 2.95.*) - COMPILER="g++-2.95.*" - ;; - 3.*) -a COMPILER="g++-3.*" - ;; - *) - ;; - esac ;; *) # ;; esac -# QT_CONFIG can contain the following: -# -# Things that affect the Qt API/ABI: -# -# Options: -# minimal-config small-config medium-config large-config full-config -# -# Different edition modules: -# gui network canvas table xml opengl sql -# -# Things that do not affect the Qt API/ABI: -# stl -# system-jpeg no-jpeg jpeg -# system-mng no-mng mng -# system-png no-png png -# system-zlib no-zlib zlib -# system-libtiff no-libtiff -# no-gif gif -# debug release -# dll staticlib -# -# nocrosscompiler -# GNUmake -# largefile -# nis -# nas -# tablet -# ipv6 -# -# X11 : x11sm xinerama xcursor xfixes xrandr xrender mitshm fontconfig xkb -# Embedded: embedded qpa freetype -# -ALL_OPTIONS= -BUILD_CONFIG= -BUILD_OPTIONS= - -# determine the build options -for config_option in $QMAKE_CONFIG $QT_CONFIG; do - SKIP="yes" - case "$config_option" in - *-config) - # take the last *-config setting. this is the highest config being used, - # and is the one that we will use for tagging plugins - BUILD_CONFIG="$config_option" - ;; - - *) # skip all other options since they don't affect the Qt API/ABI. - ;; - esac - - if [ "$SKIP" = "no" ]; then - BUILD_OPTIONS="$BUILD_OPTIONS $config_option" - fi -done - -# put the options that we are missing into .options -rm -f .options -for opt in `echo $ALL_OPTIONS`; do - SKIP="no" - if echo $BUILD_OPTIONS | grep $opt >/dev/null 2>&1; then - SKIP="yes" - fi - if [ "$SKIP" = "no" ]; then - echo "$opt" >> .options - fi -done - -# reconstruct BUILD_OPTIONS with a sorted negative feature list -# (ie. only things that are missing are will be put into the build key) -BUILD_OPTIONS= -if [ -f .options ]; then - for opt in `sort -f .options | uniq`; do - BUILD_OPTIONS="$BUILD_OPTIONS no-$opt" - done -fi -rm -f .options - -# QT_NO* defines affect the Qt API (and binary compatibility). they need -# to be included in the build key -for build_option in $D_FLAGS; do - build_option=`echo $build_option | cut -d \" -f 2 -` - case "$build_option" in - QT_NO*) - echo "$build_option" >> .options - ;; - *) - # skip all other compiler defines - ;; - esac -done - -# sort the compile time defines (helps ensure that changes in this configure -# script don't affect the QT_BUILD_KEY generation) -if [ -f .options ]; then - for opt in `sort -f .options | uniq`; do - BUILD_OPTIONS="$BUILD_OPTIONS $opt" - done -fi -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-` -if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - QT_BUILD_KEY_SYSTEM_PART="Symbian" -else - QT_BUILD_KEY_SYSTEM_PART="$CFG_ARCH $TARGET_OPERATING_SYSTEM $COMPILER" -fi - -# when cross-compiling, don't include build-host information (build key is target specific) -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_CARBON=$QT_BUILD_KEY - TARGET_OPERATING_SYSTEM="$TARGET_OPERATING_SYSTEM-cocoa" - QT_BUILD_KEY_COCOA="$CFG_USER_BUILD_KEY $CFG_ARCH $TARGET_OPERATING_SYSTEM $COMPILER $BUILD_OPTIONS" - if [ "$CFG_MAC_CARBON" = "no" ]; then - QT_BUILD_KEY=$QT_BUILD_KEY_COCOA - else - MAC_NEED_TWO_BUILD_KEYS="yes" - fi -fi -# don't break loading plugins build with an older version of Qt -QT_BUILD_KEY_COMPAT= -if [ "$QT_CROSS_COMPILE" = "no" ]; then - # previous versions of Qt used a build key built from the uname - 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 - -# is this arch compatible with some other "standard" build key -QT_BUILD_KEY_COMPAT_ARCH= -if [ ! -z "$COMPAT_ARCH" ]; then - QT_BUILD_KEY_COMPAT_ARCH="$CFG_USER_BUILD_KEY $COMPAT_ARCH $TARGET_OPERATING_SYSTEM $COMPILER $BUILD_OPTIONS" - if [ -n "$QT_NAMESPACE" ]; then - QT_BUILD_KEY_COMPAT_COMPILER="$QT_BUILD_KEY_COMPAT_ARCH $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, *$,,"` -QT_BUILD_KEY_COMPAT_ARCH=`echo $QT_BUILD_KEY_COMPAT_ARCH | sed -e "s, *, ,g" -e "s,^ *,," -e "s, *$,,"` - #------------------------------------------------------------------------------- # part of configuration information goes into qconfig.h #------------------------------------------------------------------------------- @@ -8013,32 +6955,6 @@ cat >>"$outpath/src/corelib/global/qconfig.h.new" <> "$outpath/src/corelib/global/qconfig.h.new" -else - cat >>"$outpath/src/corelib/global/qconfig.h.new" <> "$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 -if [ -n "$QT_BUILD_KEY_COMPAT_ARCH" ]; then - echo "#define QT_BUILD_KEY_COMPAT3 \"$QT_BUILD_KEY_COMPAT_ARCH\"" \ - >> "$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 [ "$CFG_HOST_ENDIAN" = "auto" ]; then cat >>"$outpath/src/corelib/global/qconfig.h.new" <>"$outpath/src/corelib/global/qconfig.h.new" fi -# if both carbon and cocoa are specified, enable the autodetection code. -if [ "$PLATFORM_MAC" = "yes" -a "$CFG_MAC_COCOA" = "yes" -a "$CFG_MAC_CARBON" = "yes" ]; then - echo "#define QT_AUTODETECT_COCOA 1" >>"$outpath/src/corelib/global/qconfig.h.new" -elif [ "$PLATFORM_MAC" = "yes" -a "$CFG_MAC_COCOA" = "yes" ]; then - echo "#define QT_MAC_USE_COCOA 1" >>"$outpath/src/corelib/global/qconfig.h.new" -fi - if [ "$CFG_FRAMEWORK" = "yes" ]; then echo "#define QT_MAC_FRAMEWORK_BUILD" >>"$outpath/src/corelib/global/qconfig.h.new" fi -if [ "$PLATFORM_MAC" = "yes" ]; then +if [ "$BUILD_ON_MAC" = "yes" ]; then cat >>"$outpath/src/corelib/global/qconfig.h.new" <>"$outpath/src/corelib/global/qconfig.h.new" fi +#REDUCE_RELOCATIONS is a elf/unix only thing, so not in windows configure.exe +if [ "$CFG_REDUCE_RELOCATIONS" = "yes" ]; then + echo "#define QT_REDUCE_RELOCATIONS" >>"$outpath/src/corelib/global/qconfig.h.new" +fi + echo "" >>"$outpath/src/corelib/global/qconfig.h.new" @@ -8218,24 +7132,13 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" # Add other configuration options to the qconfig.h file [ "$CFG_GIF" = "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_BUILTIN_GIF_READER=1" -[ "$CFG_TIFF" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_TIFF" [ "$CFG_PNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_PNG" [ "$CFG_JPEG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_JPEG" -[ "$CFG_MNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_MNG" [ "$CFG_ZLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ZLIB" -[ "$CFG_S60" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_S60" [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" -[ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" [ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" -if [ "$PLATFORM_QWS" != "yes" -a "$PLATFORM_QPA" != "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" @@ -8250,7 +7153,7 @@ fi [ "$CFG_INOTIFY" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_INOTIFY" [ "$CFG_NAS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NAS" [ "$CFG_NIS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_NIS" -[ "$CFG_OPENSSL" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENSSL" +[ "$CFG_OPENSSL" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENSSL QT_NO_SSL" [ "$CFG_OPENSSL" = "linked" ]&& QCONFIG_FLAGS="$QCONFIG_FLAGS QT_LINKED_OPENSSL" [ "$CFG_SM" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SESSIONMANAGER" @@ -8275,20 +7178,11 @@ fi [ "$CFG_ALSA" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ALSA" [ "$CFG_PULSEAUDIO" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PULSEAUDIO" [ "$CFG_COREWLAN" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_COREWLAN" -[ "$CFG_ICD" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ICD" # sort QCONFIG_FLAGS for neatness if we can [ '!' -z "$AWK" ] && QCONFIG_FLAGS=`echo $QCONFIG_FLAGS | $AWK '{ gsub(" ", "\n"); print }' | sort | uniq` QCONFIG_FLAGS=`echo $QCONFIG_FLAGS` -if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then - # Enable Symbian DLLs and export rules. - # We cannot use Linux's default export rules since they export everything. - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_DLL" - # Disable non-working features. - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CRASHHANDLER QT_NO_PRINTER QT_NO_SYSTEMTRAYICON" -fi - if [ -n "$QCONFIG_FLAGS" ]; then cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF #ifndef QT_BOOTSTRAPPED @@ -8346,13 +7240,6 @@ cat >>"$outpath/src/corelib/global/qconfig.h.new" << EOF 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" @@ -8393,19 +7280,13 @@ else QT_CONFIG="$QT_CONFIG qt_framework" QTCONFIG_CONFIG="$QTCONFIG_CONFIG qt_framework" fi -if [ "$PLATFORM_MAC" = "yes" ]; then +if [ "$BUILD_ON_MAC" = "yes" ]; then QT_CONFIG="$QT_CONFIG $CFG_MAC_ARCHS" fi if [ "$CFG_DEV" = "yes" ]; then QT_CONFIG="$QT_CONFIG private_tests" fi -if [ -z "$QT_CFLAGS_FPU" ]; then - if echo "$XPLATFORM" | grep "symbian-sbsv2" > /dev/null 2>&1; then - QT_CFLAGS_FPU=softvfp - fi -fi - # Make the application arch follow the Qt arch for single arch builds. # (for multiple-arch builds, set CONFIG manually in the application .pro file) if [ `echo "$CFG_MAC_ARCHS" | wc -w` -eq 1 ]; then @@ -8449,10 +7330,6 @@ if [ -n "$QT_GCC_MAJOR_VERSION" ]; then echo "QT_GCC_MINOR_VERSION = $QT_GCC_MINOR_VERSION" >> "$QTCONFIG.tmp" echo "QT_GCC_PATCH_VERSION = $QT_GCC_PATCH_VERSION" >> "$QTCONFIG.tmp" fi -if [ -n "$QT_CFLAGS_FPU" ]; then - echo "#Qt for symbian FPU settings" >> "$QTCONFIG.tmp" - echo "MMP_RULES += \"ARMFPU $QT_CFLAGS_FPU\"" >> "$QTCONFIG.tmp" -fi if [ -n "$QMAKE_INCDIR_OPENGL_ES2" ]; then echo "#Qt opengl include path" >> "$QTCONFIG.tmp" @@ -8471,21 +7348,7 @@ fi #------------------------------------------------------------------------------- QTMODULE="$outpath/mkspecs/qmodule.pri" -cat >>"$QTMODULE.tmp" <> "$QTMODULE.tmp" # Ensure we can link to uninistalled libraries if [ "$XPLATFORM_MINGW" != "yes" ] && [ "$CFG_EMBEDDED" != "nacl" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then @@ -8532,18 +7395,6 @@ if [ '!' -z "$CFG_SDK" ]; then echo "QMAKE_MAC_SDK = $CFG_SDK" >> "$QTMODULE.tmp" fi -# mac gcc -Xarch support -if [ "$CFG_MAC_XARCH" = "no" ]; then - echo "QMAKE_MAC_XARCH = no" >> "$QTMODULE.tmp" -fi - -#dump the qmake spec -if [ -d "$outpath/mkspecs/$XPLATFORM" ]; then - echo "QMAKESPEC = \$\$QT_BUILD_TREE/mkspecs/$XPLATFORM" >> "$QTMODULE.tmp" -else - echo "QMAKESPEC = $XPLATFORM" >> "$QTMODULE.tmp" -fi - # cmdline args cat "$QMAKE_VARS_FILE" >> "$QTMODULE.tmp" rm -f "$QMAKE_VARS_FILE" 2>/dev/null @@ -8562,13 +7413,32 @@ fi CACHEFILE="$outpath/.qmake.cache" [ -f "$CACHEFILE.tmp" ] && rm -f "$CACHEFILE.tmp" cat >>"$CACHEFILE.tmp" <> "$CACHEFILE.tmp" +else + echo "QMAKESPEC = $XPLATFORM" >> "$CACHEFILE.tmp" +fi + # incrementals INCREMENTAL="" [ "$CFG_INCREMENTAL" = "auto" ] && "$WHICH" p4 >/dev/null 2>&1 && [ "$CFG_DEV" = "yes" ] && CFG_INCREMENTAL="yes" @@ -8635,15 +7505,6 @@ EOF *) ;; esac -if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "no" ] && [ "$CFG_WEBKIT" != "no" ] && [ "$CFG_DEBUG_RELEASE" = "yes" ]; then - cat <