From 9df295a355b18f662819f091a7eebb22fb0b409e Mon Sep 17 00:00:00 2001 From: axis Date: Thu, 11 Mar 2010 14:11:32 +0100 Subject: Added -qt-style-s60 to Symbian configure options on Linux. RevBy: Miikka Heikkinen --- configure | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/configure b/configure index 1164221..20f3f84 100755 --- a/configure +++ b/configure @@ -725,6 +725,7 @@ CFG_DBUS=auto CFG_GLIB=auto CFG_GSTREAMER=auto CFG_QGTKSTYLE=auto +CFG_QS60STYLE=auto CFG_LARGEFILE=yes CFG_OPENSSL=auto CFG_PTMALLOC=no @@ -1799,6 +1800,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + style-s60) + if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ]; then + CFG_QS60STYLE="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; qdbus|dbus) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "linked" ]; then CFG_DBUS="$VAL" @@ -3993,6 +4001,15 @@ if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_X11" = "yes" ]; then EOF fi +if echo "$XQMAKESPEC" | grep symbian > /dev/null ; then + cat << EOF + +Qt for Symbian only: + -no-style-s60....... Disable s60 style + + -qt-style-s60....... Enable s60 style in the Qt Library +EOF +fi + [ "x$ERROR" = "xyes" ] && exit 1 exit 0 fi # Help @@ -4638,6 +4655,14 @@ if [ "$CFG_S60" = "auto" ]; then fi fi +if [ "$CFG_QS60STYLE" = "auto" ]; then + if echo "$XQMAKESPEC" | grep symbian > /dev/null; then + CFG_QS60STYLE=qt + else + CFG_QS60STYLE=no + fi +fi + if [ "$CFG_SYMBIAN_DEFFILES" = "auto" ]; then if echo "$XQMAKESPEC" | grep symbian > /dev/null && [ "$CFG_DEV" = "no" ]; then CFG_SYMBIAN_DEFFILES=yes @@ -6194,6 +6219,12 @@ 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 + # Disable OpenGL on Symbian. case "$XPLATFORM" in symbian*) -- cgit v0.12 From a3516a36e6d352481133ecb4ed064018a39266fc Mon Sep 17 00:00:00 2001 From: axis Date: Thu, 11 Mar 2010 14:12:14 +0100 Subject: Fixed incorrect platform string when building for Symbian. RevBy: Miikka Heikkinen --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index 20f3f84..9eec299 100755 --- a/configure +++ b/configure @@ -4023,6 +4023,8 @@ if [ "$PLATFORM_QWS" = "yes" ]; then Platform="Qt for Embedded Linux" elif [ "$PLATFORM_MAC" = "yes" ]; then Platform="Qt for Mac OS X" +elif echo "$XPLATFORM" | grep "symbian" > /dev/null ; then + Platform="Qt for Symbian" elif [ '!' -z "`getQMakeConf \"$XQMAKESPEC\" | grep QMAKE_LIBS_X11 | awk '{print $3;}'`" ]; then PLATFORM_X11=yes Platform="Qt for Linux/X11" -- cgit v0.12 From d88cd3152b5404c2a4a890b66dcc2e38ef08abde Mon Sep 17 00:00:00 2001 From: axis Date: Thu, 11 Mar 2010 14:14:12 +0100 Subject: Forced little endianness when using symbian-sbsv2 mkspec. RevBy: Miikka Heikkinen --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index 9eec299..1c81b66 100755 --- a/configure +++ b/configure @@ -5699,6 +5699,8 @@ fi if [ "$CFG_ENDIAN" = "auto" ]; then if [ "$PLATFORM_MAC" = "yes" ]; then true #leave as auto + elif [ "$XPLATFORM" = "symbian-sbsv2" ]; then + CFG_ENDIAN="Q_LITTLE_ENDIAN" else "$unixtests/endian.test" "$XQMAKESPEC" $OPT_VERBOSE "$relpath" "$outpath" F="$?" -- cgit v0.12 From d3b035c4fc583a4533aa29ffd8a8bfe9220ecdc2 Mon Sep 17 00:00:00 2001 From: axis Date: Thu, 11 Mar 2010 14:41:06 +0100 Subject: Added rpp and rsg files to ignore filter. --- config.tests/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 config.tests/.gitignore diff --git a/config.tests/.gitignore b/config.tests/.gitignore new file mode 100644 index 0000000..bd76520 --- /dev/null +++ b/config.tests/.gitignore @@ -0,0 +1,2 @@ +*.rpp +*.rsg -- cgit v0.12 From 9f300858a82f41d06f2ad9545bb71cd2d15b03e8 Mon Sep 17 00:00:00 2001 From: axis Date: Thu, 11 Mar 2010 14:43:48 +0100 Subject: Moved -s60 and -usedeffiles options docs to Symbian section. --- configure | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 1c81b66..3ae9ba4 100755 --- a/configure +++ b/configure @@ -3362,7 +3362,6 @@ Usage: $relconf [-h] [-prefix ] [-prefix-install] [-bindir ] [-libdir [-no-openssl] [-openssl] [-openssl-linked] [-no-gtkstyle] [-gtkstyle] [-no-svg] [-svg] [-no-webkit] [-webkit] [-no-javascript-jit] [-javascript-jit] [-no-script] [-script] [-no-scripttools] [-scripttools] [-no-declarative] [-declarative] - [-no-s60] [-s60] [-no-usedeffiles] [-usedeffiles] [additional platform specific options (see below)] @@ -3546,11 +3545,6 @@ EOF fi cat << EOF - -no-s60 ............ Do not compile in S60 support. - + -s60 ............... Compile with support for the S60 UI Framework. - -no-usedeffiles .... Disable the usage of DEF files. - * -usedeffiles ....... Enable the usage of DEF files. - -no-mmx ............ Do not compile with use of MMX instructions. -no-3dnow .......... Do not compile with use of 3DNOW instructions. -no-sse ............ Do not compile with use of SSE instructions. @@ -4005,8 +3999,13 @@ if echo "$XQMAKESPEC" | grep symbian > /dev/null ; 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 -- cgit v0.12 From 9379242932d63d0a328484157e1efb19e461436e Mon Sep 17 00:00:00 2001 From: axis Date: Thu, 11 Mar 2010 14:49:16 +0100 Subject: Corrected wrong header casing. --- src/gui/styles/qs60style_s60.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp index cb49fbc..5f762d8 100644 --- a/src/gui/styles/qs60style_s60.cpp +++ b/src/gui/styles/qs60style_s60.cpp @@ -63,7 +63,7 @@ #include #include #include -#include +#include #if !defined(QT_NO_STYLE_S60) || defined(QT_PLUGIN) -- cgit v0.12 From 3a1656ebc4869755980d49f1b42ed271c2c1190c Mon Sep 17 00:00:00 2001 From: axis Date: Thu, 11 Mar 2010 14:49:21 +0100 Subject: Disable OpenVG for symbian-sbsv2 on Linux. RevBy: Miikka Heikkinen --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 3ae9ba4..c4705e3 100755 --- a/configure +++ b/configure @@ -5939,7 +5939,7 @@ if [ "$CFG_OPENSSL" != "no" ]; then fi # detect OpenVG support -if [ "$CFG_OPENVG" != "no" ]; then +if [ "$CFG_OPENVG" != "no" ] && [ "$XPLATFORM" != "symbian-sbsv2" ]; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/openvg" "OpenVG" $L_FLAGS $I_FLAGS $l_FLAGS $CONFIG_ARG; then if [ "$CFG_OPENVG" = "auto" ]; then CFG_OPENVG=yes -- cgit v0.12 From c023432503ca3569ea06a4f71d2d192a6f4e069e Mon Sep 17 00:00:00 2001 From: axis Date: Tue, 23 Mar 2010 12:41:26 +0100 Subject: Fixed usage of xplatform in configure. XQMAKESPEC contains the full path, so don't use that, since the full path could contain "symbian" by accident. --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 9113988..f41f6e1 100755 --- a/configure +++ b/configure @@ -3994,7 +3994,7 @@ if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_X11" = "yes" ]; then EOF fi -if echo "$XQMAKESPEC" | grep symbian > /dev/null ; then +if echo "$XPLATFORM" | grep symbian > /dev/null ; then cat << EOF Qt for Symbian only: @@ -4656,7 +4656,7 @@ if [ "$CFG_S60" = "auto" ]; then fi if [ "$CFG_QS60STYLE" = "auto" ]; then - if echo "$XQMAKESPEC" | grep symbian > /dev/null; then + if echo "$XPLATFORM" | grep symbian > /dev/null; then CFG_QS60STYLE=qt else CFG_QS60STYLE=no -- cgit v0.12