summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/symbian/def_files_disabled.prf
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-08 08:32:48 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-08 08:32:48 (GMT)
commitaa674169ca31b6e296021b3b8f5a448aeecf0973 (patch)
tree493f0b7922ac116894a3e7f99833e97984035ccc /mkspecs/features/symbian/def_files_disabled.prf
parent50a668e62739c715dcd4f001b659ff25f71cc9c4 (diff)
parent941b13d52d975069d10093a873cd3a55bb2fd7dd (diff)
downloadQt-aa674169ca31b6e296021b3b8f5a448aeecf0973.zip
Qt-aa674169ca31b6e296021b3b8f5a448aeecf0973.tar.gz
Qt-aa674169ca31b6e296021b3b8f5a448aeecf0973.tar.bz2
Merge branch '4.6' into qstatictext-4.6
Diffstat (limited to 'mkspecs/features/symbian/def_files_disabled.prf')
-rw-r--r--mkspecs/features/symbian/def_files_disabled.prf12
1 files changed, 9 insertions, 3 deletions
diff --git a/mkspecs/features/symbian/def_files_disabled.prf b/mkspecs/features/symbian/def_files_disabled.prf
index d5c9505..557c5e3 100644
--- a/mkspecs/features/symbian/def_files_disabled.prf
+++ b/mkspecs/features/symbian/def_files_disabled.prf
@@ -2,6 +2,12 @@
CONFIG -= def_files
-# with EXPORTUNFROZEN enabled, new exports are included in the dll without
-# needing to run abld/sbs freeze
-MMP_RULES += EXPORTUNFROZEN
+# See def_files.prf for reasoning on the slight nastiness of this
+!contains(MMP_RULES, defBlock) {
+ # See def_files.prf for reasoning for excluding target types and configs below
+ !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
+ }
+}