Fixed makefile generation for Symbian.

This enables fast makefiles as well as intermodule dependencies.

This hasn't been tested with the other Symbian build systems. It's
quite possible that they will break because of this, but we will
handle that at a later time.

3 files changed, 6 insertions, 5 deletions

diff --git a/configure b/configure
index 21ccefe..abab9a1 100755
--- a/configure
+++ b/configure
@@ -7753,7 +7753,6 @@ for file in .projects .projects.3; do
 
         case $a in
         *winmain/winmain.pro) continue ;;
-        *s60main/s60main.pro) continue ;;
         *examples/activeqt/*) continue ;;
         */qmake/qmake.pro) continue ;;
         *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*|*linguist/lrelease*) SPEC=$QMAKESPEC ;;
diff --git a/src/src.pro b/src/src.pro
index 8dec49b..92101d6 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -7,6 +7,9 @@ wince*:{
   SRC_SUBDIRS += src_corelib src_xml src_gui src_sql src_network src_testlib
 } else:symbian {
   SRC_SUBDIRS += src_s60main src_corelib src_xml src_gui src_network src_sql src_testlib src_s60installs
+  !symbian-abld:!symbian-sbsv2 {
+    include(tools/tools.pro)
+  }
 } else {
     SRC_SUBDIRS += src_corelib src_xml src_network src_gui src_sql src_testlib
     !vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support
@@ -80,7 +83,7 @@ src_declarative.subdir = $$QT_SOURCE_TREE/src/declarative
 src_declarative.target = sub-declarative
 
 #CONFIG += ordered
-!wince*:!symbian:!ordered {
+!wince*:!ordered {
    src_corelib.depends = src_tools_moc src_tools_rcc
    src_gui.depends = src_corelib src_tools_uic
    embedded: src_gui.depends += src_network
@@ -117,7 +120,7 @@ src_declarative.target = sub-declarative
    contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): src_plugins.depends += src_opengl
 }
 
-!symbian {
+
 # This creates a sub-src rule
 sub_src_target.CONFIG = recursive
 sub_src_target.recurse = $$TOOLS_SUBDIRS $$SRC_SUBDIRS
@@ -164,6 +167,5 @@ for(subname, SRC_SUBDIRS) {
 debug.depends = $$EXTRA_DEBUG_TARGETS
 release.depends = $$EXTRA_RELEASE_TARGETS
 QMAKE_EXTRA_TARGETS += debug release
-}
 
 SUBDIRS += $$SRC_SUBDIRS
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index 25527e3..cd7cd9b 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -20,7 +20,7 @@ src_tools_uic3.target = sub-uic3
 src_tools_idc.subdir = $$QT_SOURCE_TREE/src/tools/idc
 src_tools_idc.target = sub-idc
 
-!wince*:!symbian:!ordered {
+!wince*:!ordered {
     # Set dependencies for each subdir
     src_tools_moc.depends = src_tools_bootstrap
     src_tools_rcc.depends = src_tools_bootstrap