summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-10 10:16:53 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-10 10:16:53 (GMT)
commit84bb6afc5c9e6ffa9b2a2913ba3849020ec35abe (patch)
treed4610e3ac396953318bea683a61d707a143f5343
parent2e69bd4457c8cbe8b54af237451ba33b2a73a89b (diff)
parent3c486f8329ff0284c76e40460613023bf3e2d1fa (diff)
downloadQt-84bb6afc5c9e6ffa9b2a2913ba3849020ec35abe.zip
Qt-84bb6afc5c9e6ffa9b2a2913ba3849020ec35abe.tar.gz
Qt-84bb6afc5c9e6ffa9b2a2913ba3849020ec35abe.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Explicit EXPORTUNFROZEN will prevent default defBlock generation
-rw-r--r--mkspecs/features/symbian/def_files.prf3
-rw-r--r--mkspecs/features/symbian/def_files_disabled.prf2
2 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/features/symbian/def_files.prf b/mkspecs/features/symbian/def_files.prf
index 6a95763..1b8e551 100644
--- a/mkspecs/features/symbian/def_files.prf
+++ b/mkspecs/features/symbian/def_files.prf
@@ -7,7 +7,8 @@ symbian-abld|symbian-sbsv2 {
# Firstly, if the MMP_RULES already contain a defBlock variable, don't generate another one
# (this bit is slightly magic, because it depends upon everyone creating their DEFFILE statements
# in a defBlock variable; but otherwise we have to expand MMP_RULES then scan for the DEFFILE keyword)
- !contains(MMP_RULES, defBlock) {
+ # Similarly, explicit EXPORTUNFROZEN should block adding defBlock
+ !contains(MMP_RULES, defBlock):!contains(MMP_RULES, EXPORTUNFROZEN) {
# Apps are executables on Symbian, so don't have exports, and therefore don't have DEF files
# Plugins use standard DEF files, which qmake generates, so shouldn't be using these DEFFILE
# statements - they use the qmake generated statements instead
diff --git a/mkspecs/features/symbian/def_files_disabled.prf b/mkspecs/features/symbian/def_files_disabled.prf
index 557c5e3..0344911 100644
--- a/mkspecs/features/symbian/def_files_disabled.prf
+++ b/mkspecs/features/symbian/def_files_disabled.prf
@@ -8,6 +8,6 @@ CONFIG -= def_files
!contains(TEMPLATE, app):!contains(CONFIG, plugin):!contains(CONFIG, staticlib): {
# with EXPORTUNFROZEN enabled, new exports are included in the dll and dso/lib without
# needing to run abld/sbs freeze
- MMP_RULES += EXPORTUNFROZEN
+ MMP_RULES *= EXPORTUNFROZEN
}
}