diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-02 14:20:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-02 14:20:45 (GMT) |
| commit | b26bdb1ee896af0dd0dfc0ec3fbb6714504c3d8d (patch) | |
| tree | f4640778e9a35cc41137f2712776e0e30432488a /src/s60installs | |
| parent | e393c706e1e8d9004ac3dc855b6e33327523a137 (diff) | |
| parent | 700ba679e88241ce35b16c46326a854c07ac9b8a (diff) | |
| download | Qt-b26bdb1ee896af0dd0dfc0ec3fbb6714504c3d8d.zip Qt-b26bdb1ee896af0dd0dfc0ec3fbb6714504c3d8d.tar.gz Qt-b26bdb1ee896af0dd0dfc0ec3fbb6714504c3d8d.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:
Fixed build break on Symbian versions earlier than S^3
Fixed qsymbianbearer.qtplugin exports in s60installs.pro
Enabled tst_mediaobject::testPlayFromResource on Symbian
Added support to Phonon MMF backend for playback of Qt resource files
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/s60installs.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 4addb84..8a8167b 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -57,8 +57,8 @@ symbian: { bearerPluginLocation = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET) bearerStubZ = $${EPOCROOT}$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin BLD_INF_RULES.prj_exports += \ - "qsymbianbearer.qtplugin $$bearerStubZ" \ - "qsymbianbearer.qtplugin $${EPOCROOT}epoc32/winscw/c$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" + "qsymbianbearer.qtplugin /$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" \ + "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 |