diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-31 15:33:12 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-31 15:33:12 (GMT) |
| commit | 73fc68802d8c0c8d3d499b279782ce270f1c5bc6 (patch) | |
| tree | 8cd7f54bc06864a741f0a2fd34412124c53e5953 /src/plugins | |
| parent | 9e4ded47bc9e3fed3ee2a15e572603bb3f7b48fc (diff) | |
| parent | 570f8970bea646055583671397c3d2706ac45004 (diff) | |
| download | Qt-73fc68802d8c0c8d3d499b279782ce270f1c5bc6.zip Qt-73fc68802d8c0c8d3d499b279782ce270f1c5bc6.tar.gz Qt-73fc68802d8c0c8d3d499b279782ce270f1c5bc6.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/gui/text/qtextengine.cpp
src/gui/text/qtextengine_p.h
src/gui/text/qtextlayout.cpp
src/plugins/phonon/mmf/mmf.pro
src/plugins/s60/5_0/5_0.pro
tests/auto/qtextlayout/tst_qtextlayout.cpp
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/bearer/symbian/symbian.pri | 9 | ||||
| -rw-r--r-- | src/plugins/phonon/mmf/mmf.pro | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/plugins/bearer/symbian/symbian.pri b/src/plugins/bearer/symbian/symbian.pri index 121cefb..8d92f57 100644 --- a/src/plugins/bearer/symbian/symbian.pri +++ b/src/plugins/bearer/symbian/symbian.pri @@ -19,8 +19,13 @@ LIBS += -lcommdb \ -linsock \ -lecom \ -lefsrv \ - -lnetmeta \ - -lconnmon + -lnetmeta + +is_using_gnupoc { + LIBS += -lconnmon +} else { + 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 614d579..a84c5ac 100644 --- a/src/plugins/phonon/mmf/mmf.pro +++ b/src/plugins/phonon/mmf/mmf.pro @@ -103,7 +103,11 @@ symbian { exists($${EPOCROOT}epoc32/include/mw/downloadmgrclient.h) { HEADERS += $$PHONON_MMF_DIR/download.h SOURCES += $$PHONON_MMF_DIR/download.cpp - LIBS += -ldownloadmgr + contains(CONFIG, is_using_gnupoc) { + LIBS += -ldownloadmgr + } else { + LIBS += -lDownloadMgr + } DEFINES += PHONON_MMF_PROGRESSIVE_DOWNLOAD } } |