diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 18:31:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 18:31:23 (GMT) |
| commit | 6a7c8f3c8fce5d9d26dfcf4bfbaa67a662d00cdf (patch) | |
| tree | 0b509797aa2cfa1b252f869c972c8166da3d07f8 /src/plugins | |
| parent | e31fd006d30f4b45cc592b2bb549b63d2c7e6832 (diff) | |
| parent | 5933d4e4fb8b48ebed641e7f6b1d032df253df30 (diff) | |
| download | Qt-6a7c8f3c8fce5d9d26dfcf4bfbaa67a662d00cdf.zip Qt-6a7c8f3c8fce5d9d26dfcf4bfbaa67a662d00cdf.tar.gz Qt-6a7c8f3c8fce5d9d26dfcf4bfbaa67a662d00cdf.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixing Linux compatibility issues for Symbian
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/bearer/symbian/symbian.pri | 9 | ||||
| -rw-r--r-- | src/plugins/phonon/mmf/mmf.pro | 4 | ||||
| -rw-r--r-- | src/plugins/s60/5_0/5_0.pro | 8 |
3 files changed, 6 insertions, 15 deletions
diff --git a/src/plugins/bearer/symbian/symbian.pri b/src/plugins/bearer/symbian/symbian.pri index 8d92f57..121cefb 100644 --- a/src/plugins/bearer/symbian/symbian.pri +++ b/src/plugins/bearer/symbian/symbian.pri @@ -19,13 +19,8 @@ LIBS += -lcommdb \ -linsock \ -lecom \ -lefsrv \ - -lnetmeta - -is_using_gnupoc { - LIBS += -lconnmon -} else { - LIBS += -lConnMon -} + -lnetmeta \ + -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 a9e5746..3b8184b 100644 --- a/src/plugins/phonon/mmf/mmf.pro +++ b/src/plugins/phonon/mmf/mmf.pro @@ -103,7 +103,7 @@ symbian { exists($${EPOCROOT}epoc32/include/mw/downloadmgrclient.h) { HEADERS += $$PHONON_MMF_DIR/download.h SOURCES += $$PHONON_MMF_DIR/download.cpp - LIBS += -lDownloadMgr + LIBS += -ldownloadmgr DEFINES += PHONON_MMF_PROGRESSIVE_DOWNLOAD } } @@ -125,7 +125,7 @@ symbian { LIBS += -lmediaclientaudiostream # For CMdaAudioOutputStream # These are for effects. - 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 diff --git a/src/plugins/s60/5_0/5_0.pro b/src/plugins/s60/5_0/5_0.pro index 00aea1b..1617a1e 100644 --- a/src/plugins/s60/5_0/5_0.pro +++ b/src/plugins/s60/5_0/5_0.pro @@ -10,12 +10,8 @@ contains(S60_VERSION, 3.1) { SOURCES += ../src/qlocale_3_2.cpp \ ../src/qdesktopservices_3_2.cpp \ ../src/qcoreapplication_3_2.cpp - contains(CONFIG, is_using_gnupoc) { - LIBS += -ldirectorylocalizer - } else { - LIBS += -lDirectoryLocalizer - } - LIBS += -lefsrv + LIBS += -lefsrv \ + -ldirectorylocalizer INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE } |