Merged master into qtquick2.

8 files changed, 8 insertions, 8 deletions

diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro
index eb41b932f2..a0220f2dc7 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 1e71eed4fa..4a82d32227 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 5edfe14241..cc97a7394b 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 193cf55ce8..348c41a85d 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 084a880cbe..9d7c8d7d00 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 8d4e03205c..a70a6df894 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 a4234cf0e8..ce6ff552cb 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 7bd4617b6b..197afd3431 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
 }