diff options
author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-05-25 09:39:12 (GMT) |
---|---|---|
committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-05-25 09:39:12 (GMT) |
commit | 04cde562a0be446234e33725c999bdb61fab3ff2 (patch) | |
tree | d6eb2367ba1f24aba7103c08c4079a8c1437d2c8 /src/gui/styles/styles.pri | |
parent | c4727a85eed57a4db698326a1bed4aa75b6e5284 (diff) | |
download | Qt-04cde562a0be446234e33725c999bdb61fab3ff2.zip Qt-04cde562a0be446234e33725c999bdb61fab3ff2.tar.gz Qt-04cde562a0be446234e33725c999bdb61fab3ff2.tar.bz2 |
Revert "Fixing Linux compatibility issues for Symbian"
Changing the library names to lowercase breaks 5.0-based
Linux builds. It will be investigated if it is possible to
change the SDKs instead. If not, the patch will have to be
extended to use the original names for 5.0 and the lowercased
ones otherwise.
This reverts commit 5933d4e4fb8b48ebed641e7f6b1d032df253df30.
Diffstat (limited to 'src/gui/styles/styles.pri')
-rw-r--r-- | src/gui/styles/styles.pri | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/styles/styles.pri b/src/gui/styles/styles.pri index c595ee8..b22a908 100644 --- a/src/gui/styles/styles.pri +++ b/src/gui/styles/styles.pri @@ -172,7 +172,11 @@ contains( styles, s60 ):contains(QT_CONFIG, s60) { symbian { SOURCES += styles/qs60style_s60.cpp LIBS += -legul -lbmpanim - LIBS += -laknicon -laknskins -laknskinsrv -lfontutils + contains(CONFIG, is_using_gnupoc) { + LIBS += -laknicon -laknskins -laknskinsrv -lfontutils + } else { + LIBS += -lAknIcon -lAKNSKINS -lAKNSKINSRV -lFontUtils + } } else { SOURCES += styles/qs60style_simulated.cpp RESOURCES += styles/qstyle_s60_simulated.qrc |