diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-22 15:47:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-22 15:47:12 (GMT) |
| commit | 2e29f107476428bba4aad5c2d56a2a19921931dc (patch) | |
| tree | a8a3f936a6535cea08a5f13cdeecba2c8b80f580 /src | |
| parent | 8529a50aba22d5b522852b6bd99de5720070e665 (diff) | |
| parent | 8e86df43cbc54b740a8aa5f950a5811ac25b9539 (diff) | |
| download | Qt-2e29f107476428bba4aad5c2d56a2a19921931dc.zip Qt-2e29f107476428bba4aad5c2d56a2a19921931dc.tar.gz Qt-2e29f107476428bba4aad5c2d56a2a19921931dc.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:
Removed unnecessary data_caging_paths.prf loading from applications
Diffstat (limited to 'src')
| -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 |
3 files changed, 0 insertions, 3 deletions
diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro index 781dfc2..dced319 100644 --- a/src/imports/folderlistmodel/folderlistmodel.pro +++ b/src/imports/folderlistmodel/folderlistmodel.pro @@ -14,7 +14,6 @@ qmldir.files += $$PWD/qmldir qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH symbian:{ - load(data_caging_paths) 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 4ef7931..d6dc758 100644 --- a/src/imports/gestures/gestures.pro +++ b/src/imports/gestures/gestures.pro @@ -14,7 +14,6 @@ qmldir.files += $$PWD/qmldir qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH symbian:{ - load(data_caging_paths) 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 9fd4db5..95ec633 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -18,7 +18,6 @@ qmldir.files += $$PWD/qmldir qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH symbian:{ - load(data_caging_paths) include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) importFiles.sources = qmlparticlesplugin.dll qmldir |