diff options
| -rw-r--r-- | mkspecs/features/symbian/def_files.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/symbian/def_files_disabled.prf | 2 | ||||
| -rw-r--r-- | src/gui/text/text.pri | 1 |
3 files changed, 4 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 } } diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri index 9ec3142..d5a9c74 100644 --- a/src/gui/text/text.pri +++ b/src/gui/text/text.pri @@ -138,6 +138,7 @@ contains(QT_CONFIG, freetype) { ../3rdparty/freetype/src/base/ftinit.c \ ../3rdparty/freetype/src/base/ftmm.c \ ../3rdparty/freetype/src/base/fttype1.c \ + ../3rdparty/freetype/src/base/ftsynth.c \ ../3rdparty/freetype/src/base/ftbitmap.c\ ../3rdparty/freetype/src/bdf/bdf.c \ ../3rdparty/freetype/src/cache/ftcache.c \ |