diff options
| author | Iain <qt-info@nokia.com> | 2010-05-14 11:52:23 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2010-05-14 13:16:48 (GMT) |
| commit | 60c715cd3a9eaa7f02dd93a083f51997b5303597 (patch) | |
| tree | c4b4515105c658b8c160136d05ec531e982f2fca | |
| parent | 0f13a088538f42faa3634c6541d9cf461764ab25 (diff) | |
| download | Qt-60c715cd3a9eaa7f02dd93a083f51997b5303597.zip Qt-60c715cd3a9eaa7f02dd93a083f51997b5303597.tar.gz Qt-60c715cd3a9eaa7f02dd93a083f51997b5303597.tar.bz2 | |
Re-enable suppression of --export_all_vtbl for static libraries
Revert fix for QTBUG-10680 - the reasoning in the original fix was
wrong. Internal typeinfo and vtable exports should be suppressed even
for static libraries, as these will leak through into the final DLL when
it links against that static lib (my testing at the time must have been
faulty, as I thought I had found that they didn't).
This change may cause problems if anyone has already frozen (internal)
TI and VT symbols into their DEF files through linking with a static
library. However, it should be perfectly safe to mark those symbols as
ABSENT in the DEF file.
An alternate solution must be found for QTBUG-10680.
Task-number: QTBUG-10678
Reviewed-by: Alessandro Portale
| -rw-r--r-- | mkspecs/features/static.prf | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mkspecs/features/static.prf b/mkspecs/features/static.prf index ef3af07..288852d 100644 --- a/mkspecs/features/static.prf +++ b/mkspecs/features/static.prf @@ -11,9 +11,4 @@ mac { QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB } -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) |