diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-04 06:48:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-04 06:48:28 (GMT) |
| commit | bc331aca61a2f212a347708c9d44a4fb092183fd (patch) | |
| tree | c378747bdbb3e87272a15b6f67b28133a9fc7232 /src/s60installs | |
| parent | bd3d16fcebdeaf1948e33af9fbf54871aadc5fc5 (diff) | |
| parent | 0c494b2c3d05a00f0cb167daed24730a2cc5815e (diff) | |
| download | Qt-bc331aca61a2f212a347708c9d44a4fb092183fd.zip Qt-bc331aca61a2f212a347708c9d44a4fb092183fd.tar.gz Qt-bc331aca61a2f212a347708c9d44a4fb092183fd.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 wrong casing of a Symbian library.
Fixed wrong static library extension on Symbian.
Fixed library casing.
Remove dependencies to pre-Symbian3 platforms from Symbian3 packages
Fix qt.sis platform dependencies for Symbian^3 builds.
Fix few QFileDialog static method issues in Symbian^3
Make emulator deployment depend on post linking in symbian-sbsv2.
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/s60installs.pro | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 3b705ad..c282b1e 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -183,10 +183,6 @@ symbian: { contains(QT_CONFIG, openvg) { qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtOpenVG$${QT_LIBINFIX}.dll graphicssystems_plugins.sources += $$QT_BUILD_TREE/plugins/graphicssystems/qvggraphicssystem$${QT_LIBINFIX}.dll - # OpenVG requires Symbian^3 or later - pkg_platform_dependencies = \ - "[0x20022E6D],0,0,0,{\"S60ProductID\"}" \ - "[0x20032DE7],0,0,0,{\"S60ProductID\"}" } contains(QT_CONFIG, opengl) { |