Remove Symbian code from tools.

Change-Id: Id9d7b2b4f6bc8b558f92bc09b7956c49e5a3752a
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

3 files changed, 33 insertions, 51 deletions

diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri
index 83fcee18d6..8a368cb228 100644
--- a/src/tools/bootstrap/bootstrap.pri
+++ b/src/tools/bootstrap/bootstrap.pri
@@ -57,7 +57,6 @@ hpux-acc*|hpuxi-acc* {
     LIBS += -lbootstrap
 }
 !contains(QT_CONFIG, zlib):!contains(QT_CONFIG, no-zlib):!cross_compile {
-    symbian:LIBS_PRIVATE += -llibz
     else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
     else:LIBS += zdll.lib
 }
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index 5cbe92309e..e6b9eefc69 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -22,41 +22,39 @@ src_tools_uic.target = sub-uic
 # Special handling, depending on type of project, if it used debug/release or only has one configuration
 EXTRA_DEBUG_TARGETS =
 EXTRA_RELEASE_TARGETS =
-!symbian {
-    for(subname, TOOLS_SUBDIRS) {
-        subdir = $$subname
-        !isEmpty($${subname}.subdir):subdir = $$eval($${subname}.subdir)
-        subpro = $$subdir/$${basename(subdir)}.pro
-        !exists($$subpro):next()
-        subtarget = $$replace(subdir, [^A-Za-z0-9], _)
-        reg_src = $$replace(QT_SOURCE_TREE, \\\\, \\\\)
-        subdir = $$replace(subdir, $$reg_src, $$QT_BUILD_TREE)
-        subdir = $$replace(subdir, /, $$QMAKE_DIR_SEP)
-        subdir = $$replace(subdir, \\\\, $$QMAKE_DIR_SEP)
-        SUB_TEMPLATE = $$list($$fromfile($$subpro, TEMPLATE))
-        !isEqual(subname, src_tools_bootstrap):if(isEqual($$SUB_TEMPLATE, lib) | isEqual($$SUB_TEMPLATE, subdirs)):!separate_debug_info {
-            #debug
-            debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
-            debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug)
-            EXTRA_DEBUG_TARGETS += debug-$${subtarget}
-            QMAKE_EXTRA_TARGETS += debug-$${subtarget}
-            #release
-            release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
-            release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) release)
-            EXTRA_RELEASE_TARGETS += release-$${subtarget}
-            QMAKE_EXTRA_TARGETS += release-$${subtarget}
-        } else { #do not have a real debug target/release
-            #debug
-            debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
-            debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
-            EXTRA_DEBUG_TARGETS += debug-$${subtarget}
-            QMAKE_EXTRA_TARGETS += debug-$${subtarget}
-            #release
-            release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
-            release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
-            EXTRA_RELEASE_TARGETS += release-$${subtarget}
-            QMAKE_EXTRA_TARGETS += release-$${subtarget}
-        }
+for(subname, TOOLS_SUBDIRS) {
+    subdir = $$subname
+    !isEmpty($${subname}.subdir):subdir = $$eval($${subname}.subdir)
+    subpro = $$subdir/$${basename(subdir)}.pro
+    !exists($$subpro):next()
+    subtarget = $$replace(subdir, [^A-Za-z0-9], _)
+    reg_src = $$replace(QT_SOURCE_TREE, \\\\, \\\\)
+    subdir = $$replace(subdir, $$reg_src, $$QT_BUILD_TREE)
+    subdir = $$replace(subdir, /, $$QMAKE_DIR_SEP)
+    subdir = $$replace(subdir, \\\\, $$QMAKE_DIR_SEP)
+    SUB_TEMPLATE = $$list($$fromfile($$subpro, TEMPLATE))
+    !isEqual(subname, src_tools_bootstrap):if(isEqual($$SUB_TEMPLATE, lib) | isEqual($$SUB_TEMPLATE, subdirs)):!separate_debug_info {
+        #debug
+        debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
+        debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug)
+        EXTRA_DEBUG_TARGETS += debug-$${subtarget}
+        QMAKE_EXTRA_TARGETS += debug-$${subtarget}
+        #release
+        release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
+        release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) release)
+        EXTRA_RELEASE_TARGETS += release-$${subtarget}
+        QMAKE_EXTRA_TARGETS += release-$${subtarget}
+    } else { #do not have a real debug target/release
+        #debug
+        debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
+        debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
+        EXTRA_DEBUG_TARGETS += debug-$${subtarget}
+        QMAKE_EXTRA_TARGETS += debug-$${subtarget}
+        #release
+        release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
+        release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
+        EXTRA_RELEASE_TARGETS += release-$${subtarget}
+        QMAKE_EXTRA_TARGETS += release-$${subtarget}
     }
 }
 
diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h
index 71f879175a..f0f1c8ae16 100644
--- a/src/tools/uic/qclass_lib_map.h
+++ b/src/tools/uic/qclass_lib_map.h
@@ -853,19 +853,6 @@ QT_CLASS_LIB(QRgb, QtGui, qrgb.h)
 QT_CLASS_LIB(QStylePainter, QtGui, qstylepainter.h)
 QT_CLASS_LIB(QTransform, QtGui, qtransform.h)
 QT_CLASS_LIB(QWMatrix, QtGui, qwmatrix.h)
-QT_CLASS_LIB(QS60MainApplicationBase, QtGui, qs60mainapplication.h)
-QT_CLASS_LIB(QS60MainApplicationBase, QtWidgets, qs60mainapplication.h)
-QT_CLASS_LIB(QS60MainApplication, QtWidgets, qs60mainapplication.h)
-QT_CLASS_LIB(QS60MainAppUiBase, QtWidgets, qs60mainappui.h)
-QT_CLASS_LIB(QS60StubAknAppUiBase, QtWidgets, qs60mainappui.h)
-QT_CLASS_LIB(QS60StubMEikStatusPaneObserver, QtWidgets, qs60mainappui.h)
-QT_CLASS_LIB(QS60StubMAknTouchPaneObserver, QtWidgets, qs60mainappui.h)
-QT_CLASS_LIB(QS60StubAknAppUi, QtWidgets, qs60mainappui.h)
-QT_CLASS_LIB(QS60MainAppUiBase, QtWidgets, qs60mainappui.h)
-QT_CLASS_LIB(QS60MainAppUi, QtWidgets, qs60mainappui.h)
-QT_CLASS_LIB(QS60MainDocumentBase, QtWidgets, qs60maindocument.h)
-QT_CLASS_LIB(QS60MainDocumentBase, QtWidgets, qs60maindocument.h)
-QT_CLASS_LIB(QS60MainDocument, QtWidgets, qs60maindocument.h)
 QT_CLASS_LIB(QKeyEventTransition, QtWidgets, qkeyeventtransition.h)
 QT_CLASS_LIB(QMouseEventTransition, QtWidgets, qmouseeventtransition.h)
 QT_CLASS_LIB(QCDEStyle, QtWidgets, qcdestyle.h)
@@ -876,7 +863,6 @@ QT_CLASS_LIB(QMacStyle, QtWidgets, qmacstyle_mac.h)
 QT_CLASS_LIB(QMotifStyle, QtWidgets, qmotifstyle.h)
 QT_CLASS_LIB(QPlastiqueStyle, QtWidgets, qplastiquestyle.h)
 QT_CLASS_LIB(QProxyStyle, QtWidgets, qproxystyle.h)
-QT_CLASS_LIB(QS60Style, QtWidgets, qs60style.h)
 QT_CLASS_LIB(QStyle, QtWidgets, qstyle.h)
 QT_CLASS_LIB(QStyleFactory, QtWidgets, qstylefactory.h)
 QT_CLASS_LIB(QStyleOption, QtWidgets, qstyleoption.h)
@@ -928,7 +914,6 @@ QT_CLASS_LIB(QWindowsMobileStyle, QtWidgets, qwindowsmobilestyle.h)
 QT_CLASS_LIB(QWindowsStyle, QtWidgets, qwindowsstyle.h)
 QT_CLASS_LIB(QWindowsVistaStyle, QtWidgets, qwindowsvistastyle.h)
 QT_CLASS_LIB(QWindowsXPStyle, QtWidgets, qwindowsxpstyle.h)
-QT_CLASS_LIB(QSymbianEvent, QtGui, qsymbianevent.h)
 QT_CLASS_LIB(QFontEngineInfo, QtGui, qabstractfontengine_qws.h)
 QT_CLASS_LIB(QFontEngineFactoryInterface, QtGui, qabstractfontengine_qws.h)
 QT_CLASS_LIB(QFontEnginePlugin, QtGui, qabstractfontengine_qws.h)