From 715b0251af3fd29bf54ad7387b3b80d65e07d23e Mon Sep 17 00:00:00 2001 From: axis Date: Wed, 27 Apr 2011 12:05:43 +0200 Subject: [PATCH] Moved to using a feature profile instead of direct inclusion. --- demos/declarative/minehunt/minehunt.pro | 2 +- demos/embedded/qmlcalculator/qmlcalculator.pro | 2 +- demos/embedded/qmlclocks/qmlclocks.pro | 2 +- demos/embedded/qmldialcontrol/qmldialcontrol.pro | 2 +- demos/embedded/qmleasing/qmleasing.pro | 2 +- demos/embedded/qmlflickr/qmlflickr.pro | 2 +- demos/embedded/qmlphotoviewer/qmlphotoviewer.pro | 2 +- demos/embedded/qmltwitter/qmltwitter.pro | 2 +- .../cppextensions/imageprovider/imageprovider.pro | 2 +- .../declarative/cppextensions/plugins/plugins.pro | 2 +- .../cppextensions/qwidgets/qwidgets.pro | 2 +- .../chapter6-plugins/chapter6-plugins.pro | 2 +- tools/qmlviewer/qmlviewer.pro | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro index eb41b93..a0220f2 100644 --- a/demos/declarative/minehunt/minehunt.pro +++ b/demos/declarative/minehunt/minehunt.pro @@ -16,7 +16,7 @@ INSTALLS = sources target symbian:{ TARGET.EPOCALLOWDLLDATA = 1 TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo qmlminehuntfiles.files = MinehuntCore minehunt.qml DEPLOYMENT += qmlminehuntfiles } diff --git a/demos/embedded/qmlcalculator/qmlcalculator.pro b/demos/embedded/qmlcalculator/qmlcalculator.pro index 1e71eed..4a82d32 100644 --- a/demos/embedded/qmlcalculator/qmlcalculator.pro +++ b/demos/embedded/qmlcalculator/qmlcalculator.pro @@ -6,7 +6,7 @@ include($$PWD/deployment.pri) symbian { TARGET.UID3 = 0x$$qmlcalculator_uid3 # defined in deployment.pri - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 LIBS += -lcone -leikcore -lavkon # Screen orientation } diff --git a/demos/embedded/qmlclocks/qmlclocks.pro b/demos/embedded/qmlclocks/qmlclocks.pro index 5edfe14..cc97a73 100644 --- a/demos/embedded/qmlclocks/qmlclocks.pro +++ b/demos/embedded/qmlclocks/qmlclocks.pro @@ -6,7 +6,7 @@ include($$PWD/deployment.pri) symbian { TARGET.UID3 = 0x$$qmlclocks_uid3 # defined in deployment.pri - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 LIBS += -lcone -leikcore -lavkon # Screen orientation } diff --git a/demos/embedded/qmldialcontrol/qmldialcontrol.pro b/demos/embedded/qmldialcontrol/qmldialcontrol.pro index 193cf55..348c41a 100644 --- a/demos/embedded/qmldialcontrol/qmldialcontrol.pro +++ b/demos/embedded/qmldialcontrol/qmldialcontrol.pro @@ -6,6 +6,6 @@ include($$PWD/deployment.pri) symbian { TARGET.UID3 = 0x$$qmldialcontrol_uid3 # defined in deployment.pri - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 } diff --git a/demos/embedded/qmleasing/qmleasing.pro b/demos/embedded/qmleasing/qmleasing.pro index 084a880..9d7c8d7 100644 --- a/demos/embedded/qmleasing/qmleasing.pro +++ b/demos/embedded/qmleasing/qmleasing.pro @@ -6,6 +6,6 @@ include($$PWD/deployment.pri) symbian { TARGET.UID3 = 0x$$qmleasing_uid3 # defined in deployment.pri - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 } diff --git a/demos/embedded/qmlflickr/qmlflickr.pro b/demos/embedded/qmlflickr/qmlflickr.pro index 8d4e032..a70a6df 100644 --- a/demos/embedded/qmlflickr/qmlflickr.pro +++ b/demos/embedded/qmlflickr/qmlflickr.pro @@ -6,7 +6,7 @@ include($$PWD/deployment.pri) symbian { TARGET.UID3 = 0x$$qmlflickr_uid3 # defined in deployment.pri - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.CAPABILITY = NetworkServices # Maximum heap size set to 128 MB in order to allow loading large images. TARGET.EPOCHEAPSIZE = 0x20000 0x8000000 diff --git a/demos/embedded/qmlphotoviewer/qmlphotoviewer.pro b/demos/embedded/qmlphotoviewer/qmlphotoviewer.pro index a4234cf..ce6ff55 100644 --- a/demos/embedded/qmlphotoviewer/qmlphotoviewer.pro +++ b/demos/embedded/qmlphotoviewer/qmlphotoviewer.pro @@ -6,7 +6,7 @@ include($$PWD/deployment.pri) symbian { TARGET.UID3 = 0x$$qmlphotoviewer_uid3 # defined in deployment.pri - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.CAPABILITY = NetworkServices TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 } diff --git a/demos/embedded/qmltwitter/qmltwitter.pro b/demos/embedded/qmltwitter/qmltwitter.pro index 7bd4617..197afd3 100644 --- a/demos/embedded/qmltwitter/qmltwitter.pro +++ b/demos/embedded/qmltwitter/qmltwitter.pro @@ -6,7 +6,7 @@ include($$PWD/deployment.pri) symbian { TARGET.UID3 = 0x$$qmltwitter_uid3 # defined in deployment.pri - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.CAPABILITY = NetworkServices TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 } diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro index ad35fc9..034ef2f 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro @@ -19,7 +19,7 @@ ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarati INSTALLS = sources ImageProviderCore_sources target symbian:{ - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example TARGET.EPOCALLOWDLLDATA = 1 importFiles.files = ImageProviderCore/qmlimageproviderplugin.dll ImageProviderCore/qmldir diff --git a/examples/declarative/cppextensions/plugins/plugins.pro b/examples/declarative/cppextensions/plugins/plugins.pro index c82c5ee..6d774ab 100644 --- a/examples/declarative/cppextensions/plugins/plugins.pro +++ b/examples/declarative/cppextensions/plugins/plugins.pro @@ -24,6 +24,6 @@ target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins/com/nok INSTALLS += qdeclarativesources sources target symbian { - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example TARGET.EPOCALLOWDLLDATA = 1 } diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro index 2302946..2c74c05 100644 --- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro +++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro @@ -14,7 +14,7 @@ target.path += $$[QT_INSTALL_EXAMPLES]/qtdeclarative/declarative/plugins INSTALLS += sources target symbian:{ - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example TARGET.EPOCALLOWDLLDATA = 1 importFiles.files = QWidgets/qmlqwidgetsplugin.dll QWidgets/qmldir diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro index 1ffbf29..f055c1b 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro +++ b/examples/declarative/tutorials/extending/chapter6-plugins/chapter6-plugins.pro @@ -15,6 +15,6 @@ SOURCES += piechart.cpp \ chartsplugin.cpp symbian { - include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) + CONFIG += qt_example TARGET.EPOCALLOWDLLDATA = 1 } diff --git a/tools/qmlviewer/qmlviewer.pro b/tools/qmlviewer/qmlviewer.pro index 84ebba8..a185bdc 100644 --- a/tools/qmlviewer/qmlviewer.pro +++ b/tools/qmlviewer/qmlviewer.pro @@ -34,7 +34,7 @@ maemo5 { } symbian { TARGET.UID3 = 0x20021317 - include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri) + CONFIG += qt_demo TARGET.EPOCHEAPSIZE = 0x20000 0x4000000 TARGET.CAPABILITY = NetworkServices ReadUserData -- 1.7.2.5