summaryrefslogtreecommitdiffstats
path: root/src/s60installs
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-11-19 22:25:52 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-11-19 22:25:52 (GMT)
commitbb382d523710454dadb50214d5a2fad6fd8dd02c (patch)
tree8f05677400a53b172102d94dbadda57bf71a02d9 /src/s60installs
parent0cfa6daa4776cd78370e644fae3005ae432b83c7 (diff)
parent7eb9cf865f2b40ca3ca4bf8655b6bb6d40d6fcdd (diff)
downloadQt-bb382d523710454dadb50214d5a2fad6fd8dd02c.zip
Qt-bb382d523710454dadb50214d5a2fad6fd8dd02c.tar.gz
Qt-bb382d523710454dadb50214d5a2fad6fd8dd02c.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: (21 commits) Fixed handling of QInputMethodEvents with nonzero replacementLength. Fixed namespace issues related to epocroot.cpp Corrected ASCII comparison and removed extra braces Add symbian scope for qfiledialog_symbian.cpp Resolve EPOCROOT in qt.conf using same logic as in .pro Make epocroot resolving compatible with more build environments Fix for QtOpenGL RVCT4 compilation error Removed extra cpp and done changes based on comments Correct flags for Symbian file dialogs Fix for WServ 64 crash on Symbian. Use include(original mkspec) instead of copying of mkspec to default Fixed code style of d92cbfc5, reported by git push. Switched qdesktopservices to use SchemeHandler for Symbian^3 and later. Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp. Documented usage of dialogs on Symbian Native file dialog on Symbian^3 Add Location as self signable capability in patch_capabilities.pl Localize .loc and .pkg content based on TRANSLATIONS Bump Qt version to 4.7.2. SSL: Fix for systemCaCertificates being called first on symbian ...
Diffstat (limited to 'src/s60installs')
-rw-r--r--src/s60installs/s60installs.pro8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 65b8781..a236028 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -191,11 +191,9 @@ symbian: {
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 -= \
- "[0x101F7961],0,0,0,{\"S60ProductID\"}" \
- "[0x102032BE],0,0,0,{\"S60ProductID\"}" \
- "[0x102752AE],0,0,0,{\"S60ProductID\"}" \
- "[0x1028315F],0,0,0,{\"S60ProductID\"}"
+ pkg_platform_dependencies = \
+ "[0x20022E6D],0,0,0,{\"S60ProductID\"}" \
+ "[0x20032DE7],0,0,0,{\"S60ProductID\"}"
}
contains(QT_CONFIG, opengl) {