diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2010-06-18 13:33:48 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2010-06-18 13:33:48 (GMT) |
| commit | d0b68442682382414527024b3e86f87dc8597c9c (patch) | |
| tree | ad3c535df2e5b2d489b1b5217345d30eddb237d1 /src/s60installs | |
| parent | 35d4b2558f79d971d49ed3b86e6e48a349f948a1 (diff) | |
| download | Qt-d0b68442682382414527024b3e86f87dc8597c9c.zip Qt-d0b68442682382414527024b3e86f87dc8597c9c.tar.gz Qt-d0b68442682382414527024b3e86f87dc8597c9c.tar.bz2 | |
Update S60 stuff after renaming the webkit component.
The new name is QtWebKit not org.webkit.
Reviewed-by:jbarron
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/qt.iby | 4 | ||||
| -rw-r--r-- | src/s60installs/s60installs.pro | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/s60installs/qt.iby b/src/s60installs/qt.iby index f43f344..935bdc5 100644 --- a/src/s60installs/qt.iby +++ b/src/s60installs/qt.iby @@ -80,12 +80,12 @@ file=ABI_DIR\BUILD_DIR\qmlfolderlistmodelplugin.dll SHARED_LIB_DIR\qmlfolde file=ABI_DIR\BUILD_DIR\qmlgesturesplugin.dll SHARED_LIB_DIR\qmlgesturesplugin.dll file=ABI_DIR\BUILD_DIR\qmlparticlesplugin.dll SHARED_LIB_DIR\qmlparticlesplugin.dll -data=\epoc32\data\z\resource\qt\imports\org\webkit\qmlwebkitplugin.qtplugin resource\qt\imports\org\webkit\qmlwebkitplugin.qtplugin +data=\epoc32\data\z\resource\qt\imports\QtWebKit\qmlwebkitplugin.qtplugin resource\qt\imports\QtWebKit\qmlwebkitplugin.qtplugin data=\epoc32\data\z\resource\qt\imports\Qt\labs\folderlistmodel\qmlfolderlistmodelplugin.qtplugin resource\qt\imports\Qt\labs\folderlistmodel\qmlfolderlistmodelplugin.qtplugin data=\epoc32\data\z\resource\qt\imports\Qt\labs\gestures\qmlgesturesplugin.qtplugin resource\qt\imports\Qt\labs\gestures\qmlgesturesplugin.qtplugin data=\epoc32\data\z\resource\qt\imports\Qt\labs\particles\qmlparticlesplugin.qtplugin resource\qt\imports\Qt\labs\particles\qmlparticlesplugin.qtplugin -data=\epoc32\data\z\resource\qt\imports\org\webkit\qmldir resource\qt\imports\org\webkit\qmldir +data=\epoc32\data\z\resource\qt\imports\QtWebKit\qmldir resource\qt\imports\QtWebKit\qmldir data=\epoc32\data\z\resource\qt\imports\Qt\labs\folderlistmodel\qmldir resource\qt\imports\Qt\labs\folderlistmodel\qmldir data=\epoc32\data\z\resource\qt\imports\Qt\labs\gestures\qmldir resource\qt\imports\Qt\labs\gestures\qmldir data=\epoc32\data\z\resource\qt\imports\Qt\labs\particles\qmldir resource\qt\imports\Qt\labs\particles\qmldir diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 6d8513e..485471b 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -177,9 +177,9 @@ symbian: { DEPLOYMENT += folderlistmodelImport gesturesImport particlesImport contains(QT_CONFIG, webkit): { - webkitImport.sources = $$QT_BUILD_TREE/imports/org/webkit/qmlwebkitplugin$${QT_LIBINFIX}.dll - webkitImport.sources += $$QT_SOURCE_TREE/src/imports/webkit/qmldir - webkitImport.path = c:$$QT_IMPORTS_BASE_DIR/org/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 } } |