diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-12-02 14:56:28 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-12-02 15:14:22 (GMT) |
| commit | 1f6ec34d46bc36ff9396e5e865af81cecf310cc3 (patch) | |
| tree | 4655a38c8478120cd3fe4f7e735584469cbf4da8 | |
| parent | 1c9d051399c683bf89dfd1bca54bc3c48d534087 (diff) | |
| download | Qt-1f6ec34d46bc36ff9396e5e865af81cecf310cc3.zip Qt-1f6ec34d46bc36ff9396e5e865af81cecf310cc3.tar.gz Qt-1f6ec34d46bc36ff9396e5e865af81cecf310cc3.tar.bz2 | |
symbian - don't export qsymbianbearer.qtplugin twice
The file was being exported using both prj_exports and deployment
lines. As deployment is copying to epoc32 z and c directories, the
prj_exports is not needed.
Moved the prj_exports rules into the S60 5.0 section, where deployment
is not used but rather explicit rules added to the sis file.
Task-number: ou1cimx1#946574
Reviewed-by: mread
| -rwxr-xr-x | src/s60installs/s60installs.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 08c4829..d5281f4 100755 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -34,9 +34,6 @@ symbian: { pluginLocations = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET) bearerPluginLocation = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET) bearerStubZ = $${EPOCROOT}$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin - BLD_INF_RULES.prj_exports += \ - "$$S60_INSTALLS_SOURCE_DIR/qsymbianbearer.qtplugin /$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" \ - "$$S60_INSTALLS_SOURCE_DIR/qsymbianbearer.qtplugin /epoc32/winscw/c$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" } else { pluginLocations = $$QT_BUILD_TREE/plugins/s60 bearerPluginLocation = $$QT_BUILD_TREE/plugins/bearer @@ -54,6 +51,9 @@ symbian: { "ENDIF" \ " \"$$bearerStubZ\" - \"c:$$replace(QT_PLUGINS_BASE_DIR,/,\\)\\bearer\\qsymbianbearer$${QT_LIBINFIX}.qtplugin\"" qtlibraries.pkg_postrules += qts60plugindeployment + BLD_INF_RULES.prj_exports += \ + "$$S60_INSTALLS_SOURCE_DIR/qsymbianbearer.qtplugin /$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" \ + "$$S60_INSTALLS_SOURCE_DIR/qsymbianbearer.qtplugin /epoc32/winscw/c$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" } else { # No need to deploy plugins for older platform versions when building on Symbian3 or later bearer_plugin.files = $$QT_BUILD_TREE/plugins/bearer/qsymbianbearer$${QT_LIBINFIX}.dll |