diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-20 10:47:02 +0100 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-12-20 10:47:02 +0100 |
| commit | 10c90522d6e3807baac3c4bfca4eedc51a4251f5 (patch) | |
| tree | 92005b547e3b92eb9e640fae8c78fdcdc13b6dd9 /src/s60installs/s60installs.pro | |
| parent | 64e1f888586f2c988b08bcc93579990e970b7206 (diff) | |
| parent | 97b039438bc31bb420138d72549372adb1244dc8 (diff) | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/plugins/phonon/mmf/mmf.pro
src/s60installs/s60installs.pro
tests/auto/qapplication/test/test.pro
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
Diffstat (limited to 'src/s60installs/s60installs.pro')
| -rw-r--r-- | src/s60installs/s60installs.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 0710b53122..ebbde782b9 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -132,7 +132,7 @@ symbian: { codecs_plugins.path = c:$$QT_PLUGINS_BASE_DIR/codecs contains(QT_CONFIG, phonon-backend) { - phonon_backend_plugins.files += $$QMAKE_LIBDIR_QT/phonon_mmf$${QT_LIBINFIX}.dll + phonon_backend_plugins.files += $$QT_BUILD_TREE/plugins/phonon_backend/phonon_mmf$${QT_LIBINFIX}.dll phonon_backend_plugins.path = c:$$QT_PLUGINS_BASE_DIR/phonon_backend DEPLOYMENT += phonon_backend_plugins |