Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Added silent behavior to the most important Symbian build steps.
  Fixed compiling with symbian/linux-armcc and configure -silent option
  Removed some warnings from armcc that are unneeded.
  Made the makefile build system use QMAKE_CFLAGS.xxx properly.
  Automatically disabled unsupported modules for certain compilers.
  Fixed an incorrect profile inclusion.

6 files changed, 36 insertions, 5 deletions

diff --git a/configure b/configure
index ae23509..aa48c84 100755
--- a/configure
+++ b/configure
@@ -7080,6 +7080,13 @@ EOF
         canBuildWebKit="no"
         canBuildQtConcurrent="no"
 	;;
+    symbian/*-gcce)
+        canBuildWebKit="no"
+        canBuildQtConcurrent="no"
+        ;;
+    symbian/*-armcc)
+        canBuildQtConcurrent="no"
+        ;;
 esac
 
 if [ "$CFG_GUI" = "no" ]; then
diff --git a/mkspecs/features/symbian/armcc_warnings.prf b/mkspecs/features/symbian/armcc_warnings.prf
index 72bc996..3331bff 100644
--- a/mkspecs/features/symbian/armcc_warnings.prf
+++ b/mkspecs/features/symbian/armcc_warnings.prf
@@ -1,13 +1,22 @@
+# 68:   integer conversion resulted in a change of sign (sounds useful, but it's
+#       buggy and is reported even in places where it makes no sense)
 # 111:  Statement is unreachable
 # 185:  Dynamic initialization in unreachable code
+# 187:  use of "=" where "==" may have been intended
 # 191:  Type qualifier is meaningless on cast type
 # 368:  class "<class>" defines no constructor to initialize the following: <member>
 #       (Disabled because there are other ways of assigning besides constructors)
+# 830:  function "xxx" has no corresponding operator delete (to be called if an
+#       exception is thrown during initialization of an allocated object) (used a
+#       lot in 3rd party code)
+# 997:  function "xxx" is hidden by "yyy" -- virtual function override intended?
+#       (used all over the place in the Symbian SDK)
 # 1293: Assignment in condition
 # 1294: pre-ANSI C style functions declarations (used a lot in 3rd party code)
 # 2874: <variable> may be used before being set (this one sounds useful, but
 #       it's output also for class instances, making it useless in practice)
-QMAKE_CFLAGS.ARMCC += --diag_suppress 111,185,191,368,1293,1294,2874
+QMAKE_CFLAGS.ARMCC += --diag_suppress 68,111,185,187,191,368,830,997,1293,1294,2874
+QMAKE_CXXFLAGS.ARMCC += --diag_suppress 68,111,185,187,191,368,830,997,1293,1294,2874
 
 # 6780: <origvis> visibility removed from symbol '<symname>' through <impexp>
 QMAKE_LFLAGS.ARMCC += --diag_suppress 6780
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index ce124ec..a36193e 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -1,3 +1,11 @@
+linux-armcc {
+    QMAKE_CFLAGS += $$QMAKE_CFLAGS.ARMCC
+    QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS.ARMCC
+} else:linux-gcce {
+    QMAKE_CFLAGS += $$QMAKE_CFLAGS.GCCE
+    QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS.GCCE
+}
+
 # We need a target name without the INFIX'ed part, since flags are not infixed.
 equals(QMAKE_TARGET_PRODUCT, Qt4):clean_TARGET = $$replace(TARGET, "$${QT_LIBINFIX}$", "")
 else:clean_TARGET = $$TARGET
@@ -131,6 +139,7 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) {
                       $$capability \
                       $$QMAKE_ELF2E32_FLAGS \
                       $$QMAKE_POST_LINK
+    silent:QMAKE_POST_LINK = @echo postlinking $@ && $$QMAKE_POST_LINK
     QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}.sym
     QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}.dso
     QMAKE_CLEAN += $${symbianObjdir}/$${baseTarget}.dso
@@ -154,7 +163,7 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) {
     DEFINES += __DLL__
 }
 
-contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@.*") {
+contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@:.*") {
     !isEmpty(QMAKE_POST_LINK) {
         # No way to honor the '@' :-(
         QMAKE_POST_LINK = $$replace(QMAKE_POST_LINK, "^@", "")
@@ -177,6 +186,7 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@.*") {
                       $$QMAKE_ELF2E32_FLAGS \
                       && ln "$${symbianDestdir}/$${baseTarget}.exe" "$${symbianDestdir}/$${baseTarget}" \
                       $$QMAKE_POST_LINK
+    silent:QMAKE_POST_LINK = @echo postlinking $@ && $$QMAKE_POST_LINK
     QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}.sym
     QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}.exe
     QMAKE_CLEAN += $${symbianDestdir}/$${baseTarget}
@@ -243,6 +253,7 @@ symbianresources.commands = cpp -nostdinc -undef \
                             -o$${symbianDestdir}/${QMAKE_FILE_BASE}$${QT_LIBINFIX}.rsc \
                             -h$${symbian_resources_RCC_DIR}/${QMAKE_FILE_BASE}$${QT_LIBINFIX}.rsg \
                             -i${QMAKE_FILE_NAME}
+silent:symbianresources.commands = @echo rcomp $< && $$symbianresources.commands
 symbianresources.dependency_type = TYPE_C
 symbianresources.CONFIG = no_link target_predeps
 
@@ -266,6 +277,7 @@ contains(TEMPLATE, "app"):!contains(CONFIG, "no_icon") {
                                   -o$${symbianDestdir}/$${baseResourceTarget}.rsc \
                                   -h$${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rsg \
                                   -i$${baseResourceTarget}.rss
+    silent:symbianGenResource.commands = @echo rcomp $${baseResourceTarget}.rss && $$symbianGenResource.commands
     symbianGenResource.depends = $${baseResourceTarget}.rss
     PRE_TARGETDEPS += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rsg
     QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rsg
@@ -284,6 +296,7 @@ contains(TEMPLATE, "app"):!contains(CONFIG, "no_icon") {
                                      -o$${symbianDestdir}/$${baseResourceTarget}_reg.rsc \
                                      -h$${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rsg \
                                      -i$${baseResourceTarget}_reg.rss
+    silent:symbianGenRegResource.commands = @echo rcomp $${baseResourceTarget}_reg.rss && $$symbianGenRegResource.commands
     symbianGenRegResource.depends = $${baseResourceTarget}_reg.rss $${symbian_resources_RCC_DIR}/$${baseResourceTarget}.rsg
     PRE_TARGETDEPS += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rsg
     QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${baseResourceTarget}_reg.rsg
diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf
index 77fb1ea..f8072e3 100644
--- a/mkspecs/symbian/linux-armcc/qmake.conf
+++ b/mkspecs/symbian/linux-armcc/qmake.conf
@@ -31,8 +31,8 @@ QMAKE_QtWebKit_CXXFLAGS	=  --arm
 # Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000.
 QMAKE_QtWebKit_LFLAGS	=  --rw-base 0xE00000
 
-QMAKE_CFLAGS		+= --dllimport_runtime --preinclude rvct2_2.h  --diag_suppress 186,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --no_vfe --apcs /inter $$QMAKE_CFLAGS.ARMCC
-QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS $$QMAKE_CXXFLAGS.ARMCC
+QMAKE_CFLAGS		+= --dllimport_runtime --preinclude rvct2_2.h  --diag_suppress 186,611,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --no_vfe --apcs /inter
+QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS
 QMAKE_LFLAGS      	+=  --symver_soname --diag_suppress 6331,6780 --bpabi --reloc --datacompressor=off --split --dll --no_scanlib
 QMAKE_LFLAGS_APP        += --entry _E32Startup
 QMAKE_LFLAGS_SHLIB      += --entry _E32Dll
diff --git a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri
index ab8d846..494c64c 100644
--- a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri
+++ b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri
@@ -13,6 +13,7 @@
                                           && $$QMAKE_COPY ${QMAKE_FILE_OUT_BASE}.h ${QMAKE_FILE_OUT}.tmp \
                                           && $$QMAKE_DEL_FILE ${QMAKE_FILE_OUT_BASE}.h \
                                           && $$QMAKE_MOVE ${QMAKE_FILE_OUT}.tmp ${QMAKE_FILE_OUT}
+        silent:symbian_sqlite3_header.commands = @echo unzipping $@ && $$symbian_sqlite3_header.commands
         QMAKE_EXTRA_COMPILERS += symbian_sqlite3_header
 
         # The QMAKE_COPY section is to update timestamp on the file.
@@ -24,6 +25,7 @@
                                        && $$QMAKE_COPY ${QMAKE_FILE_OUT_BASE}.dso ${QMAKE_FILE_OUT}.tmp \
                                        && $$QMAKE_DEL_FILE ${QMAKE_FILE_OUT_BASE}.dso \
                                        && $$QMAKE_MOVE ${QMAKE_FILE_OUT}.tmp ${QMAKE_FILE_OUT}
+        silent:symbian_sqlite3_dso.commands = @echo unzipping $@ && $$symbian_sqlite3_dso.commands
         QMAKE_EXTRA_COMPILERS += symbian_sqlite3_dso
 
         symbian_sqlite3_ver_dso.input = symbian_sqlite3_zip_file
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.pri b/src/sql/drivers/sqlite/qsql_sqlite.pri
index 3560c64..78a4e49 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.pri
+++ b/src/sql/drivers/sqlite/qsql_sqlite.pri
@@ -1,7 +1,7 @@
 HEADERS += $$PWD/qsql_sqlite.h
 SOURCES += $$PWD/qsql_sqlite.cpp
 
-symbian:include(../../plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri)
+symbian:include($$QT_SOURCE_TREE/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri)
 
 !system-sqlite:!contains(LIBS, .*sqlite3.*) {
     include($$PWD/../../../3rdparty/sqlite.pri)