summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorPasi Pentikainen <pasi.a.pentikainen@nokia.com>2011-10-19 16:14:28 (GMT)
committerPasi Pentikainen <pasi.a.pentikainen@nokia.com>2011-10-20 11:03:41 (GMT)
commitfc050e950734eaaf268c99f50310b8ec2312e089 (patch)
tree295e3189ddf72f2ea2d6ea59dea9fe237cc09c17 /src/gui
parent104c22a68c422152ff3cf03eb3615e7826fefbd0 (diff)
downloadQt-fc050e950734eaaf268c99f50310b8ec2312e089.zip
Qt-fc050e950734eaaf268c99f50310b8ec2312e089.tar.gz
Qt-fc050e950734eaaf268c99f50310b8ec2312e089.tar.bz2
Symbian Linuxification building case changes
Changes the libraries to match the case of files for building Symbian in linux. Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/dialogs/dialogs.pri6
-rw-r--r--src/gui/styles/styles.pri6
-rw-r--r--src/gui/util/util.pri6
3 files changed, 3 insertions, 15 deletions
diff --git a/src/gui/dialogs/dialogs.pri b/src/gui/dialogs/dialogs.pri
index 1dddb44..fc1ea9e 100644
--- a/src/gui/dialogs/dialogs.pri
+++ b/src/gui/dialogs/dialogs.pri
@@ -109,11 +109,7 @@ SOURCES += \
dialogs/qprintpreviewdialog.cpp
symbian:contains(QT_CONFIG, s60) {
- contains(CONFIG, is_using_gnupoc) {
- LIBS += -lcommondialogs
- } else {
- 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 b6eeec9..45ed8eb 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/util/util.pri b/src/gui/util/util.pri
index 7395604..7cf1a55 100644
--- a/src/gui/util/util.pri
+++ b/src/gui/util/util.pri
@@ -57,9 +57,5 @@ symbian {
DEFINES += USE_SCHEMEHANDLER
}
- contains(CONFIG, is_using_gnupoc) {
- LIBS += -ldirectorylocalizer
- } else {
- LIBS += -lDirectoryLocalizer
- }
+ LIBS += -ldirectorylocalizer
}