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 /examples | |
| 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 'examples')
| -rw-r--r-- | examples/declarative/cppextensions/imageprovider/imageprovider.pro | 1 | ||||
| -rw-r--r-- | examples/declarative/cppextensions/qwidgets/qwidgets.pro | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro index f218c30..c7e7843 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro @@ -19,7 +19,6 @@ ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/imageprovid INSTALLS = sources ImageProviderCore_sources target symbian:{ - load(data_caging_paths) include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) TARGET.EPOCALLOWDLLDATA = 1 diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro index 8d87804..3ec7d29 100644 --- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro +++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro @@ -14,7 +14,6 @@ target.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins INSTALLS += sources target symbian:{ - load(data_caging_paths) include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) TARGET.EPOCALLOWDLLDATA = 1 |