summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2010-06-22 12:52:50 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2010-06-22 12:52:50 (GMT)
commit8e86df43cbc54b740a8aa5f950a5811ac25b9539 (patch)
tree81e104606901baa0411f5dc457e4f98b5beb86b7
parentbe41ab8d52ad56ba861b5552da259018d8dd0e21 (diff)
downloadQt-8e86df43cbc54b740a8aa5f950a5811ac25b9539.zip
Qt-8e86df43cbc54b740a8aa5f950a5811ac25b9539.tar.gz
Qt-8e86df43cbc54b740a8aa5f950a5811ac25b9539.tar.bz2
Removed unnecessary data_caging_paths.prf loading from applications
Since plugin and import paths variables were moved to symbian.conf, there were many unnecessary load(data_caging_paths) statements left in applications. Task-number: QTBUG-11619 Reviewed-by: Janne Koskinen
-rw-r--r--demos/declarative/minehunt/minehunt.pro1
-rw-r--r--demos/spectrum/spectrum.pro2
-rw-r--r--examples/declarative/cppextensions/imageprovider/imageprovider.pro1
-rw-r--r--examples/declarative/cppextensions/qwidgets/qwidgets.pro1
-rw-r--r--src/imports/folderlistmodel/folderlistmodel.pro1
-rw-r--r--src/imports/gestures/gestures.pro1
-rw-r--r--src/imports/particles/particles.pro1
-rw-r--r--tests/auto/qtextstream/test/test.pro1
8 files changed, 0 insertions, 9 deletions
diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro
index 91d02cf..aac91f6 100644
--- a/demos/declarative/minehunt/minehunt.pro
+++ b/demos/declarative/minehunt/minehunt.pro
@@ -24,7 +24,6 @@ MinehuntCore_sources.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt/MinehuntCo
INSTALLS = sources MinehuntCore_sources target
symbian:{
- load(data_caging_paths)
TARGET.EPOCALLOWDLLDATA = 1
include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
TARGET.CAPABILITY = NetworkServices ReadUserData
diff --git a/demos/spectrum/spectrum.pro b/demos/spectrum/spectrum.pro
index a8f09de..d5a07f7 100644
--- a/demos/spectrum/spectrum.pro
+++ b/demos/spectrum/spectrum.pro
@@ -14,8 +14,6 @@ SUBDIRS += app
TARGET = spectrum
symbian {
- load(data_caging_paths)
-
# Create a 'make sis' rule which can be run from the top-level
include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
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
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
diff --git a/tests/auto/qtextstream/test/test.pro b/tests/auto/qtextstream/test/test.pro
index c70c27b..20823de 100644
--- a/tests/auto/qtextstream/test/test.pro
+++ b/tests/auto/qtextstream/test/test.pro
@@ -28,7 +28,6 @@ wince*|symbian: {
wince*: {
DEFINES += SRCDIR=\\\"\\\"
}else:symbian {
- load(data_caging_paths)
# Symbian can't define SRCDIR meaningfully here
qt_not_deployed {
codecs_plugins.sources = qcncodecs.dll qjpcodecs.dll qtwcodecs.dll qkrcodecs.dll