summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2009-12-29 13:48:40 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2009-12-29 13:48:40 (GMT)
commit8ebad8059e08c8e9318f5d6cfdf84747874dd5fc (patch)
tree54ff87dfa9f949e508dec6fc62b1059ea762faac /src
parent56ccbf03983bc703a2220cc600f127f52ce89a53 (diff)
parent337931b28cb1157512ae2b6ab67ceaaf63bf1e48 (diff)
downloadQt-8ebad8059e08c8e9318f5d6cfdf84747874dd5fc.zip
Qt-8ebad8059e08c8e9318f5d6cfdf84747874dd5fc.tar.gz
Qt-8ebad8059e08c8e9318f5d6cfdf84747874dd5fc.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed QtWebkit.dll from Qt.sis in Symbian builds
Diffstat (limited to 'src')
-rw-r--r--src/s60installs/s60installs.pro4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index 6842af8..e024396 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -105,10 +105,6 @@ symbian: {
qtlibraries.sources += QtDeclarative.dll
}
- contains(QT_CONFIG, webkit): {
- qtlibraries.sources += QtWebKit.dll
- }
-
graphicssystems_plugins.path = c:$$QT_PLUGINS_BASE_DIR/graphicssystems
contains(QT_CONFIG, openvg) {
qtlibraries.sources += QtOpenVG.dll