summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPasi Pentikainen <pasi.a.pentikainen@nokia.com>2011-10-19 19:14:28 +0300
committerPasi Pentikainen <pasi.a.pentikainen@nokia.com>2011-10-20 14:03:41 +0300
commitfc050e950734eaaf268c99f50310b8ec2312e089 (patch)
tree295e3189ddf72f2ea2d6ea59dea9fe237cc09c17
parent104c22a68c422152ff3cf03eb3615e7826fefbd0 (diff)
Symbian Linuxification building case changes
Changes the libraries to match the case of files for building Symbian in linux. Reviewed-by: Miikka Heikkinen
-rw-r--r--src/gui/dialogs/dialogs.pri6
-rw-r--r--src/gui/styles/styles.pri6
-rw-r--r--src/gui/util/util.pri6
-rw-r--r--src/plugins/bearer/symbian/symbian.pri6
-rw-r--r--src/plugins/phonon/mmf/mmf.pro12
5 files changed, 6 insertions, 30 deletions
diff --git a/src/gui/dialogs/dialogs.pri b/src/gui/dialogs/dialogs.pri
index 1dddb44aad..fc1ea9eafb 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 b6eeec9af8..45ed8eb9a9 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 7395604f48..7cf1a55308 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
}
diff --git a/src/plugins/bearer/symbian/symbian.pri b/src/plugins/bearer/symbian/symbian.pri
index 8d92f57b68..74dc4ee008 100644
--- a/src/plugins/bearer/symbian/symbian.pri
+++ b/src/plugins/bearer/symbian/symbian.pri
@@ -21,11 +21,7 @@ LIBS += -lcommdb \
-lefsrv \
-lnetmeta
-is_using_gnupoc {
- LIBS += -lconnmon
-} else {
- LIBS += -lConnMon
-}
+LIBS += -lconnmon
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer
target.path += $$[QT_INSTALL_PLUGINS]/bearer
diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro
index a84c5ac091..5144f35763 100644
--- a/src/plugins/phonon/mmf/mmf.pro
+++ b/src/plugins/phonon/mmf/mmf.pro
@@ -103,11 +103,7 @@ symbian {
exists($${EPOCROOT}epoc32/include/mw/downloadmgrclient.h) {
HEADERS += $$PHONON_MMF_DIR/download.h
SOURCES += $$PHONON_MMF_DIR/download.cpp
- contains(CONFIG, is_using_gnupoc) {
- LIBS += -ldownloadmgr
- } else {
- LIBS += -lDownloadMgr
- }
+ LIBS += -ldownloadmgr
DEFINES += PHONON_MMF_PROGRESSIVE_DOWNLOAD
}
}
@@ -129,11 +125,7 @@ symbian {
LIBS += -lmediaclientaudiostream # For CMdaAudioOutputStream
# These are for effects.
- is_using_gnupoc {
- LIBS += -laudioequalizereffect -lbassboosteffect -ldistanceattenuationeffect -ldopplerbase -leffectbase -lenvironmentalreverbeffect -llistenerdopplereffect -llistenerlocationeffect -llistenerorientationeffect -llocationbase -lloudnesseffect -lorientationbase -lsourcedopplereffect -lsourcelocationeffect -lsourceorientationeffect -lstereowideningeffect
- } else {
- LIBS += -lAudioEqualizerEffect -lBassBoostEffect -lDistanceAttenuationEffect -lDopplerbase -lEffectBase -lEnvironmentalReverbEffect -lListenerDopplerEffect -lListenerLocationEffect -lListenerOrientationEffect -lLocationBase -lLoudnessEffect -lOrientationBase -lSourceDopplerEffect -lSourceLocationEffect -lSourceOrientationEffect -lStereoWideningEffect
- }
+ LIBS += -laudioequalizereffect -lbassboosteffect -ldistanceattenuationeffect -ldopplerbase -leffectbase -lenvironmentalreverbeffect -llistenerdopplereffect -llistenerlocationeffect -llistenerorientationeffect -llocationbase -lloudnesseffect -lorientationbase -lsourcedopplereffect -lsourcelocationeffect -lsourceorientationeffect -lstereowideningeffect
# This is to allow IAP to be specified
LIBS += -lcommdb