diff options
| author | axis <qt-info@nokia.com> | 2010-03-01 14:06:02 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-01 14:06:02 (GMT) |
| commit | 88a36e9e7e0e0bc09788c41ab6b968031dbc9154 (patch) | |
| tree | 947663f695f54a0deb2724116f82d89fde761576 /src/s60installs | |
| parent | 4be1e01c6faebe11bfe205c1b910049747b5c335 (diff) | |
| parent | ca82ee4ee55e52c75326949148455af1095df014 (diff) | |
| download | Qt-88a36e9e7e0e0bc09788c41ab6b968031dbc9154.zip Qt-88a36e9e7e0e0bc09788c41ab6b968031dbc9154.tar.gz Qt-88a36e9e7e0e0bc09788c41ab6b968031dbc9154.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
configure
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.cpp
qmake/generators/symbian/symmake_sbsv2.cpp
src/plugins/plugins.pro
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/s60installs.pro | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 4b57864..8a6cb38 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -99,7 +99,16 @@ symbian: { qtbackup.sources = backup_registration.xml qtbackup.path = c:/private/10202D56/import/packages/$$replace(TARGET.UID3, 0x,) - DEPLOYMENT += qtresources qtlibraries qtbackup imageformats_plugins codecs_plugins graphicssystems_plugins + bearer_plugins.path = c:$$QT_PLUGINS_BASE_DIR/bearer + bearer_plugins.sources += qsymbianbearer.dll + + DEPLOYMENT += qtresources \ + qtlibraries \ + qtbackup \ + imageformats_plugins \ + codecs_plugins \ + graphicssystems_plugins \ + bearer_plugins contains(QT_CONFIG, svg): { qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtSvg.dll |