Various small fixes and cleanups for symbian qmake generator.

The included fixes / cleanups:
    - QtLibs PKG filename changed
    - Component name in Qt libs pkg changed to "Qt for S60"
        * Done in order to make SISX upgrade possible after pre-release.
    - Removed passing of 'fixedTarget' member variable as an argument
    - Removed whitespaces from generated file names
    - Fixed 'make sisx' calling syntax when custom makefile name used
    - Fixed MAKEFILE variable content in generated makefiles
    - Changed names of environment variables used by 'make sisx'
        * Nee variables have 'QT_SISX_' prefix

Reviewed-By: Miikka Heikkinen

1 files changed, 92 insertions, 0 deletions

diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
new file mode 100644
index 0000000..0314958
--- /dev/null
+++ b/src/s60installs/s60installs.pro
@@ -0,0 +1,92 @@
+# Use subdirs template to suppress generation of unnecessary files
+TEMPLATE = subdirs
+
+symbian: {
+    load(data_caging_paths)
+
+    SUBDIRS=
+    # WARNING: Changing TARGET name will break Symbian SISX upgrade functionality
+    TARGET = "Qt for S60"
+    TARGET.UID3 = 0x2001E61C
+    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
+
+    qtresources.sources = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/s60main.rsc
+    qtresources.path = $$APP_RESOURCE_DIR
+
+    qtlibraries.sources = \
+        QtCore.dll \
+        QtXml.dll \
+        QtGui.dll \
+        QtNetwork.dll \
+        QtTest.dll \
+        QtSql.dll \
+        qts60plugin_3_1.dll \
+        qts60plugin_3_2.dll \
+        qts60plugin_5_0.dll
+
+
+    # TODO: This should be conditional in PKG file, see commented code below
+    # However we don't yet have such mechanism in place
+    contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+        contains(CONFIG, system-sqlite): qtlibraries.sources += sqlite3.dll
+    }
+
+    #; EXISTS statement does not resolve !. Lets check the most common drives
+    #IF NOT EXISTS("c:\sys\bin\sqlite3.dll") AND NOT EXISTS("e:\sys\bin\sqlite3.dll") AND NOT EXISTS("z:\sys\bin\sqlite3.dll")
+    #"\Epoc32\release\armv5\UREL\sqlite3.dll"-"!:\sys\bin\sqlite3.dll"
+    #ENDIF
+
+    qtlibraries.path = /sys/bin
+
+    vendorinfo = \
+        "; Localised Vendor name" \
+        "%{\"Nokia, Qt\"}" \
+        " " \
+        "; Unique Vendor name" \
+        ":\"Nokia, Qt\"" \
+        " "
+
+
+    qtlibraries.pkg_prerules = vendorinfo
+    qtlibraries.pkg_prerules += "; Dependencies of Qt libraries"
+    qtlibraries.pkg_prerules += "(0x20013851), 1, 5, 1, {\"PIPS Installer\"}"
+    contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) {
+        qtlibraries.pkg_prerules += "(0x200110CB), 1, 5, 1, {\"Open C LIBSSL Common\"}"
+    }
+    contains(CONFIG, stl) {
+        qtlibraries.pkg_prerules += "(0x2000F866), 1, 0, 0, {\"Standard C++ Library Common\"}"
+    }
+
+    !contains(QT_CONFIG, no-jpeg): imageformats_plugins.sources += qjpeg.dll
+    !contains(QT_CONFIG, no-gif):  imageformats_plugins.sources += qgif.dll
+    !contains(QT_CONFIG, no-mng):  imageformats_plugins.sources += qmng.dll
+    !contains(QT_CONFIG, no-tiff): imageformats_plugins.sources += qtiff.dll
+    !contains(QT_CONFIG, no-ico):  imageformats_plugins.sources += qico.dll
+    imageformats_plugins.path = $$QT_PLUGINS_BASE_DIR/imageformats
+
+    codecs_plugins.sources = qcncodecs.dll qjpcodecs.dll qtwcodecs.dll qkrcodecs.dll
+    codecs_plugins.path = $$QT_PLUGINS_BASE_DIR/codecs
+
+    DEPLOYMENT += qtresources qtlibraries imageformats_plugins codecs_plugins graphicssystems_plugins
+
+    contains(QT_CONFIG, svg): {
+       qtlibraries.sources += QtSvg.dll
+       imageformats_plugins.sources += qsvg.dll
+       iconengines_plugins.sources = qsvgicon.dll
+       iconengines_plugins.path = $$QT_PLUGINS_BASE_DIR/iconengines
+       DEPLOYMENT += iconengines_plugins
+    }
+
+    contains(QT_CONFIG, phonon): {
+       qtlibraries.sources += Phonon.dll
+    }
+
+    graphicssystems_plugins.path = $$QT_PLUGINS_BASE_DIR/graphicssystems
+    contains(QT_CONFIG, openvg) {
+        qtlibraries.sources = QtOpenVG.dll
+        graphicssystems_plugins.sources += qvggraphicssystem.dll
+    }
+
+    BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)"
+    BLD_INF_RULES.prj_exports += "qtdemoapps.iby $$CORE_APP_LAYER_IBY_EXPORT_PATH(qtdemoapps.iby)"
+}