summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-01-25 17:56:33 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2011-01-25 17:56:33 (GMT)
commit5422e929cad04633a06c156cba96cfcd69262522 (patch)
treeafb3c9b76c05d80238a1ff76f4e8f4019fac1651 /configure
parentac798c5d77c59ea8dfe29c9d1896fb6604e3a628 (diff)
parenta0e0a9378d10db9c8ab3ba4d59f5c576ee4cbc40 (diff)
downloadQt-5422e929cad04633a06c156cba96cfcd69262522.zip
Qt-5422e929cad04633a06c156cba96cfcd69262522.tar.gz
Qt-5422e929cad04633a06c156cba96cfcd69262522.tar.bz2
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts: configure src/network/bearer/bearer.pri
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure109
1 files changed, 34 insertions, 75 deletions
diff --git a/configure b/configure
index c1e70f0..d88e920 100755
--- a/configure
+++ b/configure
@@ -185,30 +185,13 @@ fi
#-------------------------------------------------------------------------------
PLATFORM_X11=no
-PLATFORM_MAC=no
PLATFORM_QWS=maybe
PLATFORM_QPA=maybe
BUILD_ON_MAC=no;
-[ -d /System/Library/Frameworks/Carbon.framework ] && BUILD_ON_MAC=yes
-
-if [ -f "$relpath"/src/gui/kernel/qapplication_mac.mm ] && [ $BUILD_ON_MAC = "yes" ]; then
- # Qt/Mac
- # ~ the Carbon SDK exists
- # ~ src/gui/base/qapplication_mac.cpp is present
- # ~ this is the internal edition and Qt/Mac sources exist
+if [ -d /System/Library/Frameworks/Carbon.framework ]; then
PLATFORM_MAC=maybe
-elif [ -f "$relpath"/src/gui/kernel/qapplication_qws.cpp ]; then
- # Qt Embedded
- # ~ src/gui/base/qapplication_qws.cpp is present
- # ~ this is the free or commercial edition
- # ~ this is the internal edition and Qt Embedded is explicitly enabled
- if [ -f "$relpath"/src/gui/kernel/qapplication_mac.mm ]; then
- # This is a depot build, or an all-platforms package
- PLATFORM_QWS=maybe
- else
- # This must be the embedded package, since the Qt/Mac source files are not present
- PLATFORM_QWS=yes
- fi
+else
+ PLATFORM_MAC=no
fi
#-----------------------------------------------------------------------------
@@ -333,17 +316,10 @@ earlyArgParse()
case "$VAR" in
embedded)
CFG_EMBEDDED="$VAL"
- if [ "$PLATFORM_QWS" != "no" ]; then
- if [ "$PLATFORM_QWS" = "maybe" ]; then
- PLATFORM_X11=no
- PLATFORM_MAC=no
- PLATFORM_QWS=yes
- PLATFORM_QPA=no
- fi
- else
- echo "No license exists to enable Qt for Embedded Linux. Disabling."
- CFG_EMBEDDED=no
- fi
+ PLATFORM_X11=no
+ PLATFORM_MAC=no
+ PLATFORM_QWS=yes
+ PLATFORM_QPA=no
;;
qpa)
CFG_EMBEDDED="no"
@@ -1049,7 +1025,7 @@ while [ "$#" -gt 0 ]; do
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|-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|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles)
+ -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|-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|-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)
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
VAL=yes
;;
@@ -1336,31 +1312,17 @@ while [ "$#" -gt 0 ]; do
;;
embedded)
CFG_EMBEDDED="$VAL"
- if [ "$PLATFORM_QWS" != "no" ]; then
- if [ "$PLATFORM_QWS" = "maybe" ]; then
- PLATFORM_X11=no
- PLATFORM_MAC=no
- PLATFORM_QWS=yes
- PLATFORM_QPA=no
- fi
- else
- echo "No license exists to enable Qt for Embedded Linux. Disabling."
- CFG_EMBEDDED=no
- fi
+ PLATFORM_X11=no
+ PLATFORM_MAC=no
+ PLATFORM_QWS=yes
+ PLATFORM_QPA=no
;;
embedded-lite|qpa)
CFG_EMBEDDED="no"
- if [ "$PLATFORM_QPA" != "no" ]; then
- if [ "$PLATFORM_QPA" = "maybe" ]; then
- PLATFORM_X11=no
- PLATFORM_MAC=no
- PLATFORM_QWS=no
- PLATFORM_QPA=yes
- fi
- else
- echo "No license exists to enable Qt QPA. Disabling."
- CFG_EMBEDDED=no
- fi
+ PLATFORM_X11=no
+ PLATFORM_MAC=no
+ PLATFORM_QWS=no
+ PLATFORM_QPA=yes
;;
nacl)
;;
@@ -1414,7 +1376,9 @@ while [ "$#" -gt 0 ]; do
openvg)
if [ "$VAL" = "auto" ] || [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_OPENVG="$VAL"
- CFG_EGL="auto"
+ if [ "$CFG_EGL" = "no" ] && [ "$VAL" != "no" ]; then
+ CFG_EGL=auto
+ fi
else
UNKNOWN_OPT=yes
fi
@@ -1467,16 +1431,9 @@ while [ "$#" -gt 0 ]; do
CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL"
;;
x11)
- if [ "$PLATFORM_MAC" = "yes" ]; then
- PLATFORM_MAC=no
- elif [ "$PLATFORM_QWS" = "yes" ]; then
- PLATFORM_QWS=no
- elif [ "$PLATFORM_QPA" = "yes" ]; then
- PLATFORM_QPA=no
- fi
- if [ "$CFG_FRAMEWORK" = "auto" ]; then
- CFG_FRAMEWORK=no
- fi
+ PLATFORM_QPA=no
+ PLATFORM_MAC=no
+ PLATFORM_QWS=no
PLATFORM_X11=yes
;;
sdk)
@@ -3709,7 +3666,7 @@ Usage: $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir
[-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-declarative] [-declarative] [-no-declarative-debug] [-declarative-debug]
[additional platform specific options (see below)]
@@ -4709,9 +4666,9 @@ if [ -n "$PERL" ] && [ -x "$relpath/bin/syncqt" ]; then
SYNCQT_OPTS=
[ "$CFG_DEV" = "yes" ] && SYNCQT_OPTS="$SYNCQT_OPTS -check-includes"
if [ "$OPT_SHADOW" = "yes" ]; then
- "$outpath/bin/syncqt" $SYNCQT_OPTS
+ "$outpath/bin/syncqt" $SYNCQT_OPTS || exit 1
elif [ "$CFG_DEV" = "yes" ] || [ ! -d $relpath/include ] || [ -d $relpath/.git ]; then
- QTDIR="$relpath" perl "$outpath/bin/syncqt" $SYNCQT_OPTS
+ QTDIR="$relpath" perl "$outpath/bin/syncqt" $SYNCQT_OPTS || exit 1
fi
fi
@@ -6336,14 +6293,14 @@ fi # QWS
if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
if [ "$CFG_EGL" != "no" ]; then
# detect EGL support
- if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/egl" "EGL (EGL/egl.h)" $L_FLAGS $I_FLAGS $l_FLAGS; then
- # EGL specified by QMAKE_*_EGL, included with <EGL/egl.h>
- CFG_EGL=yes
- CFG_EGL_GLES_INCLUDES=no
- elif "$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
+ 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 <GLES/egl.h>
CFG_EGL=yes
CFG_EGL_GLES_INCLUDES=yes
+ elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/egl" "EGL (EGL/egl.h)" $L_FLAGS $I_FLAGS $l_FLAGS; then
+ # EGL specified by QMAKE_*_EGL, included with <EGL/egl.h>
+ CFG_EGL=yes
+ CFG_EGL_GLES_INCLUDES=no
else
if [ "$CFG_EGL" = "yes" ]; then
echo "The EGL functionality test failed!"
@@ -8543,7 +8500,9 @@ if [ "$CFG_WEBKIT" != "no" ]; then
fi
fi
echo "Declarative module ..... $CFG_DECLARATIVE"
-echo "Declarative debugging ...$CFG_DECLARATIVE_DEBUG"
+if [ "$CFG_DECLARATIVE" = "yes" ]; then
+ echo "Declarative debugging ...$CFG_DECLARATIVE_DEBUG"
+fi
echo "Support for S60 ........ $CFG_S60"
echo "Symbian DEF files ...... $CFG_SYMBIAN_DEFFILES"
echo "STL support ............ $CFG_STL"
@@ -8626,7 +8585,7 @@ else
echo "OpenGL support ......... no"
fi
if [ "$CFG_EGL" != "no" ]; then
- if [ "$CFG_EGL_GLES_INCLUDES" != "no" ]; then
+ if [ "$CFG_EGL_GLES_INCLUDES" = "yes" ]; then
echo "EGL support ............ yes <GLES/egl.h>"
else
echo "EGL support ............ yes <EGL/egl.h>"