diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-11 06:09:18 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-02-11 06:09:18 (GMT) |
| commit | 9a76a90b1944db52bd4180d27c01781fbb3499d4 (patch) | |
| tree | 46ac1557761e30127330520d2fa6412305e07443 /src/s60installs/s60installs.pro | |
| parent | b5fe99c0105a9791e34a8b959822430497a4aeb9 (diff) | |
| parent | b9907e309885b4b8ce280c721231a56a583b51d0 (diff) | |
| download | Qt-9a76a90b1944db52bd4180d27c01781fbb3499d4.zip Qt-9a76a90b1944db52bd4180d27c01781fbb3499d4.tar.gz Qt-9a76a90b1944db52bd4180d27c01781fbb3499d4.tar.bz2 | |
Merge remote branch 'origin/4.6' into bearermanagement/integration
Conflicts:
src/s60installs/s60installs.pro
Diffstat (limited to 'src/s60installs/s60installs.pro')
| -rw-r--r-- | src/s60installs/s60installs.pro | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index d0bd59e..6d07f7c 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -82,6 +82,9 @@ symbian: { qtbackup.sources = backup_registration.xml qtbackup.path = c:/private/10202D56/import/packages/$$replace(TARGET.UID3, 0x,) + bearer_plugins.path = c:$$QT_PLUGINS_BASE_DIR/bearer + bearer_plugins.sources += qsymbianbearer.dll + DEPLOYMENT += qtresources \ qtlibraries \ qtbackup \ @@ -120,8 +123,9 @@ symbian: { graphicssystems_plugins.sources += qvggraphicssystem.dll } - bearer_plugins.path = c:$$QT_PLUGINS_BASE_DIR/bearer - bearer_plugins.sources += qsymbianbearer.dll + contains(QT_CONFIG, multimedia) { + qtlibraries.sources += QtMultimedia.dll + } BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)" BLD_INF_RULES.prj_exports += "qtdemoapps.iby $$CORE_APP_LAYER_IBY_EXPORT_PATH(qtdemoapps.iby)" |