3 files changed, 3 insertions, 7 deletions
diff --git a/src/gui/dialogs/dialogs.pri b/src/gui/dialogs/dialogs.pri
index 12e3a71..c25b6d5 100644
--- a/src/gui/dialogs/dialogs.pri
+++ b/src/gui/dialogs/dialogs.pri
@@ -109,7 +109,7 @@ SOURCES += \
         dialogs/qprintpreviewdialog.cpp
 
 symbian:contains(QT_CONFIG, s60) {
-    LIBS += -lCommonDialogs
+    LIBS += -lcommondialogs
     SOURCES += dialogs/qfiledialog_symbian.cpp \
                dialogs/qcolordialog_symbian.cpp
 }
diff --git a/src/gui/styles/styles.pri b/src/gui/styles/styles.pri
index b22a908..c595ee8 100644
--- a/src/gui/styles/styles.pri
+++ b/src/gui/styles/styles.pri
@@ -172,11 +172,7 @@ contains( styles, s60 ):contains(QT_CONFIG, s60) {
     symbian {
         SOURCES += styles/qs60style_s60.cpp
         LIBS += -legul -lbmpanim
-        contains(CONFIG, is_using_gnupoc) {
-            LIBS += -laknicon -laknskins -laknskinsrv -lfontutils
-        } else {
-            LIBS += -lAknIcon -lAKNSKINS -lAKNSKINSRV -lFontUtils
-        }
+        LIBS += -laknicon -laknskins -laknskinsrv -lfontutils
     } else {
         SOURCES += styles/qs60style_simulated.cpp
         RESOURCES += styles/qstyle_s60_simulated.qrc
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index c74ecc8..c4e89d5 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -909,7 +909,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyph(QGlyphSet *set, uint glyph, Glyph
         }
     }
 
-    if (default_hint_style == HintNone)
+    if (default_hint_style == HintNone || set->outline_drawing)
         load_flags |= FT_LOAD_NO_HINTING;
     else
         load_flags |= load_target;