diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-24 11:55:31 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-24 11:55:31 (GMT) |
| commit | 3119f5e2d675ba5d39e94cdae26db9eb8f373eab (patch) | |
| tree | c2f5d1d682e3113232d7cc0af0e48f9d4a902656 | |
| parent | 3555687f5ff270c61499a5597444895bec0d70fb (diff) | |
| download | Qt-3119f5e2d675ba5d39e94cdae26db9eb8f373eab.zip Qt-3119f5e2d675ba5d39e94cdae26db9eb8f373eab.tar.gz Qt-3119f5e2d675ba5d39e94cdae26db9eb8f373eab.tar.bz2 | |
Moved the QML WebKit integration into QtWebKit.sis
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 7 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro | 7 | ||||
| -rw-r--r-- | src/s60installs/s60installs.pro | 7 |
3 files changed, 7 insertions, 14 deletions
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index f0e41bc..e208b5f 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -25,6 +25,13 @@ symbian: { webkitbackup.sources = ../WebKit/qt/symbian/backup_registration.xml webkitbackup.path = /private/10202D56/import/packages/$$replace(TARGET.UID3, 0x,) + contains(QT_CONFIG, declarative): { + declarativeImport.sources = qmlwebkitplugin$${QT_LIBINFIX}.dll + declarativeImport.sources += ../WebKit/qt/declarative/qmldir + declarativeImport.path = c:$$QT_IMPORTS_BASE_DIR/QtWebKit + DEPLOYMENT += declarativeImport + } + DEPLOYMENT += webkitlibs webkitbackup # Need to guarantee that these come before system includes of /epoc32/include diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro b/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro index c75bbce..75268f3 100644 --- a/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro +++ b/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro @@ -67,13 +67,6 @@ qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH symbian:{ TARGET.UID3 = 0x20021321 - load(data_caging_paths) - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) - - importFiles.sources = qmlwebkitplugin.dll qmldir - importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH - - DEPLOYMENT = importFiles } INSTALLS += target qmldir diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index a093e4c..4addb84 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -175,13 +175,6 @@ symbian: { particlesImport.path = c:$$QT_IMPORTS_BASE_DIR/Qt/labs/particles DEPLOYMENT += folderlistmodelImport gesturesImport particlesImport - - contains(QT_CONFIG, webkit): { - webkitImport.sources = $$QT_BUILD_TREE/imports/QtWebKit/qmlwebkitplugin$${QT_LIBINFIX}.dll - webkitImport.sources += $$QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/declarative/qmldir - webkitImport.path = c:$$QT_IMPORTS_BASE_DIR/QtWebKit - DEPLOYMENT += webkitImport - } } graphicssystems_plugins.path = c:$$QT_PLUGINS_BASE_DIR/graphicssystems |