summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/s60installs/qt.iby2
-rw-r--r--src/s60installs/qt_libs.pro28
2 files changed, 15 insertions, 15 deletions
diff --git a/src/s60installs/qt.iby b/src/s60installs/qt.iby
index 8a0e03c..dc9ec43 100644
--- a/src/s60installs/qt.iby
+++ b/src/s60installs/qt.iby
@@ -5,7 +5,7 @@
// Dependancies for more than one module
#include <base.iby>
-#include <openenv.iby> // QtCore, QtGui, QtNetwork, QtOpenGL, QSvgIconEngine,
+#include <openenv.iby> // QtCore, QtGui, QtNetwork, QtOpenGL, QSvgIconEngine,
#include <cone.iby> // QtGui, QtOpenGL
#include <stdcpp.iby> // for std C++ support
diff --git a/src/s60installs/qt_libs.pro b/src/s60installs/qt_libs.pro
index 369a74e..cb03a05 100644
--- a/src/s60installs/qt_libs.pro
+++ b/src/s60installs/qt_libs.pro
@@ -9,10 +9,10 @@ symbian: {
TARGET.UID3 = 0x2001E61C
VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
- qtresources.sources = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/s60main.rsc
+ qtresources.sources = $${EPOCROOT}$$HW_ZDIR$$APP_RESOURCE_DIR/s60main.rsc
qtresources.path = $$APP_RESOURCE_DIR
- qtlibraries.sources = \
+ qtlibraries.sources = \
QtCore.dll \
QtXml.dll \
QtGui.dll \
@@ -23,21 +23,21 @@ symbian: {
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
- }
-
+ 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
+ #ENDIF
qtlibraries.path = /sys/bin
-
+
vendorinfo = \
"; Localised Vendor name" \
"%{\"Nokia, Qt Software\"}" \
@@ -45,8 +45,8 @@ symbian: {
"; Unique Vendor name" \
":\"Nokia, Qt Software\"" \
" "
-
-
+
+
qtlibraries.pkg_prerules = vendorinfo
qtlibraries.pkg_prerules += "; Dependencies of Qt libraries"
qtlibraries.pkg_prerules += "(0x20013851), 1, 5, 1, {\"PIPS Installer\"}"
@@ -56,7 +56,7 @@ symbian: {
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
@@ -66,10 +66,10 @@ symbian: {
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): {
+ contains(QT_CONFIG, svg): {
qtlibraries.sources += QtSvg.dll
imageformats_plugins.sources += qsvg.dll
iconengines_plugins.sources = qsvgicon.dll
@@ -79,7 +79,7 @@ symbian: {
contains(QT_CONFIG, phonon): {
qtlibraries.sources += Phonon.dll
- }
+ }
graphicssystems_plugins.path = $$QT_PLUGINS_BASE_DIR/graphicssystems
contains(QT_CONFIG, openvg) {