summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-08-20 08:58:19 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-08-20 08:58:19 (GMT)
commitd3d7969329f42d52ed7140cb2fd684171a484eb5 (patch)
treefaec811e9c3f5182d251c2d092620e3827da6a94 /mkspecs/features
parente15bb13513e1157094c42d014db906063d057230 (diff)
downloadQt-d3d7969329f42d52ed7140cb2fd684171a484eb5.zip
Qt-d3d7969329f42d52ed7140cb2fd684171a484eb5.tar.gz
Qt-d3d7969329f42d52ed7140cb2fd684171a484eb5.tar.bz2
Comment clarifications based on mkspecs review.
Reviewed-by: TrustMe
Diffstat (limited to 'mkspecs/features')
-rw-r--r--mkspecs/features/symbian/qt.prf3
-rw-r--r--mkspecs/features/symbian/stl.prf7
2 files changed, 7 insertions, 3 deletions
diff --git a/mkspecs/features/symbian/qt.prf b/mkspecs/features/symbian/qt.prf
index db2ea14..dd4a4d5 100644
--- a/mkspecs/features/symbian/qt.prf
+++ b/mkspecs/features/symbian/qt.prf
@@ -6,6 +6,9 @@ CONFIG += qtmain
load(qt)
+# Add dependency to QtLibs package to all other projects besides QtLibs.
+# Note: QtLibs with full capabilities has UID3 of 0x2001E61C,
+# while self-signed version typically has temporary UID3 of 0xE001E61C.
contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0xE001E61C) {
default_deployment.pkg_prerules += \
"; Default dependency to Qt libraries" \
diff --git a/mkspecs/features/symbian/stl.prf b/mkspecs/features/symbian/stl.prf
index 9eb6b86..c885bb7 100644
--- a/mkspecs/features/symbian/stl.prf
+++ b/mkspecs/features/symbian/stl.prf
@@ -1,14 +1,15 @@
CONFIG -= stl_off
-# STL usage in S60 requires the following mmp variables to be uses
+# STL usage in S60 requires the following mmp variables to be used.
+# These are added via $$STLLIB_USAGE_CW_FLAGS and $$STLLIB_USAGE_DEFINES
+# variables below.
# OPTION CW -wchar_t on
# MACRO _WCHAR_T_DECLARED
QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS
DEFINES *= $$STLLIB_USAGE_DEFINES
-# Legacy support requires some hardcoded stdapis paths.
-# Note: Also the new header is used from STL when it is enabled
+# Path to stlport headers
INCLUDEPATH += $$OS_LAYER_STDCPP_SYSTEMINCLUDE
# Remove mkspecs/common/symbian/stl-off from beginning of includepath