From 42a7c756482f645a011ff6fe3607038d749c1d88 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 9 Mar 2010 12:08:30 +0200 Subject: Export qtdemoapps.iby to proper location Part of QtP delta reduction effort Reviewed-by: Janne Anttila --- src/s60installs/s60installs.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/s60installs/s60installs.pro') diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 1f3b4a6737..86deb40aac 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -125,5 +125,5 @@ symbian: { } 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)" + BLD_INF_RULES.prj_exports += "qtdemoapps.iby $$CUSTOMER_VARIANT_APP_LAYER_IBY_EXPORT_PATH(qtdemoapps.iby)" } -- cgit v1.2.1 From d73df73c556b0a225fdde7341549ed834bc691f4 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Fri, 12 Mar 2010 12:58:45 +0000 Subject: Moved Symbian audio backend into QtMultimedia.dll Changed backend from being a plugin, to being statically compiled into QtMultimedia.dll. This is to achieve consistency with the backends for other plugins, and to allow the plugin API to be modified. Task-number: QTBUG-8994 Reviewed-by: trustme --- src/s60installs/s60installs.pro | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/s60installs/s60installs.pro') diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 86deb40aac..1b1e965417 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -78,12 +78,6 @@ symbian: { DEPLOYMENT += phonon_backend_plugins } - contains(QT_CONFIG, audio-backend) { - qaudio_backend_plugins.sources += qaudio.dll - qaudio_backend_plugins.path = c:$$QT_PLUGINS_BASE_DIR/audio - DEPLOYMENT += qaudio_backend_plugins - } - # Support backup & restore for Qt libraries qtbackup.sources = backup_registration.xml qtbackup.path = c:/private/10202D56/import/packages/$$replace(TARGET.UID3, 0x,) -- cgit v1.2.1