diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-18 13:22:27 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-18 13:22:27 (GMT) |
| commit | b68c5cd72b4fc58a1422a801e1c52c72be32f3d4 (patch) | |
| tree | 0de572352715008a541f52d8d17d377195469604 /mkspecs/features | |
| parent | 9f80bac10f1ab5155999cb554559cd3dacab2bb9 (diff) | |
| parent | b9b8a1cb6bc5a1b93373a7a634a23dcd785b3c31 (diff) | |
| download | Qt-b68c5cd72b4fc58a1422a801e1c52c72be32f3d4.zip Qt-b68c5cd72b4fc58a1422a801e1c52c72be32f3d4.tar.gz Qt-b68c5cd72b4fc58a1422a801e1c52c72be32f3d4.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
src/gui/kernel/qwidget_x11.cpp
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/static.prf | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mkspecs/features/static.prf b/mkspecs/features/static.prf index 7ee7a8a..21a532e 100644 --- a/mkspecs/features/static.prf +++ b/mkspecs/features/static.prf @@ -12,4 +12,9 @@ mac { CONFIG += hide_symbols } +symbian { + # we don't care about exports from static libraries, as they don't end up in DEF files + MMP_RULES -= $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA +} + !static_and_shared:fix_output_dirs:fixExclusiveOutputDirs(static, shared) |