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.

1 files changed, 7 insertions, 0 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