diff options
| author | axis <qt-info@nokia.com> | 2010-06-04 10:07:18 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-06-04 10:07:18 (GMT) |
| commit | 0ed548a67bfcb7b8ca76bbcf7d36d1afd8f115e9 (patch) | |
| tree | 239d99db858b89662ba8544787c8172116043c34 /mkspecs/features | |
| parent | 58c591974bf34577e27638f1328a04c4f7c698f8 (diff) | |
| parent | cb59e56bc9f34c50dc4a2d01d2ea506c5d735225 (diff) | |
| download | Qt-0ed548a67bfcb7b8ca76bbcf7d36d1afd8f115e9.zip Qt-0ed548a67bfcb7b8ca76bbcf7d36d1afd8f115e9.tar.gz Qt-0ed548a67bfcb7b8ca76bbcf7d36d1afd8f115e9.tar.bz2 | |
Merge branch 'def_files_and_plugins' into 4.7-s60
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/symbian/def_files.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/features/symbian/def_files.prf b/mkspecs/features/symbian/def_files.prf index eb17402..6a95763 100644 --- a/mkspecs/features/symbian/def_files.prf +++ b/mkspecs/features/symbian/def_files.prf @@ -41,7 +41,7 @@ symbian-abld|symbian-sbsv2 { } } -} else:contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) { +} else:contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib):!contains(CONFIG, plugin) { !isEmpty(DEF_FILE) { defFile = $$DEF_FILE } else { diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index c230272..92988aa 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -96,6 +96,9 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) { QMAKE_POST_LINK = $$replace(QMAKE_POST_LINK, "^@", "") QMAKE_POST_LINK = && $$QMAKE_POST_LINK } + + contains(CONFIG, plugin):QMAKE_ELF2E32_FLAGS += --definput=plugin_commonu.def + # The tee and grep at the end work around the issue that elf2e32 doesn't return non-null on error. # The comparison of dso files is to avoid extra building of modules that depend on this dso, in # case it has not changed. |