diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-23 17:58:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-23 17:58:45 (GMT) |
| commit | 3ac06f540761fa259317f773c8a4517e252623a3 (patch) | |
| tree | eaeca7b5ffa14177fc99afeec55cfe11b10c0376 /src | |
| parent | f6835920b5497f228e2aa3ba397437af30a0bfe9 (diff) | |
| parent | 9d285e0b9f49fd5bdf3976e99b8ec168f9d7add6 (diff) | |
| download | Qt-3ac06f540761fa259317f773c8a4517e252623a3.zip Qt-3ac06f540761fa259317f773c8a4517e252623a3.tar.gz Qt-3ac06f540761fa259317f773c8a4517e252623a3.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:
Provide the Webkit Qml plugin with a UID3 on Symbian
Provide Qml plugins with UID3s on Symbian
Fix "missing store_build" errors
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro | 1 | ||||
| -rw-r--r-- | src/imports/folderlistmodel/folderlistmodel.pro | 1 | ||||
| -rw-r--r-- | src/imports/gestures/gestures.pro | 1 | ||||
| -rw-r--r-- | src/imports/particles/particles.pro | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro b/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro index 122d90a..1371e57 100644 --- a/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro +++ b/src/3rdparty/webkit/WebKit/qt/declarative/declarative.pro @@ -64,6 +64,7 @@ qmldir.files += $$PWD/qmldir qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH symbian:{ + TARGET.UID3 = 0x20021321 load(data_caging_paths) include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index dced319..49a6baa 100644 --- a/src/imports/folderlistmodel/folderlistmodel.pro +++ b/src/imports/folderlistmodel/folderlistmodel.pro @@ -14,6 +14,7 @@ qmldir.files += $$PWD/qmldir qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH symbian:{ + TARGET.UID3 = 0x20021320 include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) importFiles.sources = qmlfolderlistmodelplugin.dll qmldir diff --git a/src/imports/gestures/gestures.pro b/src/imports/gestures/gestures.pro index d6dc758..265bbca 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -14,6 +14,7 @@ qmldir.files += $$PWD/qmldir qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH symbian:{ + TARGET.UID3 = 0x2002131F include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) importFiles.sources = qmlgesturesplugin.dll qmldir diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index 95ec633..91c1b9f 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -18,6 +18,7 @@ qmldir.files += $$PWD/qmldir qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH symbian:{ + TARGET.UID3 = 0x2002131E include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) importFiles.sources = qmlparticlesplugin.dll qmldir |