Use a better method for installing declarative demos.

Simply copy the demo directories, instead of writing a stub .pro file.
(cherry picked from commit c97e1e29aedaceead92cd231b3a77d60bab2af50)

7 files changed, 16 insertions, 76 deletions

diff --git a/demos/declarative/calculator/calculator.pro b/demos/declarative/calculator/calculator.pro
deleted file mode 100644
index efe641331f..0000000000
--- a/demos/declarative/calculator/calculator.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE=app
-CONFIG -= qt separate_debug_info
-LIBS =
-QT =
-QMAKE_LINK = @: dummy
-
-sources.files = \
-    CalcButton.qml \
-    calculator.js \
-    calculator.qml
-sources.path = $$[QT_INSTALL_DEMOS]/declarative/calculator
-INSTALLS = sources
-
diff --git a/demos/declarative/declarative.pro b/demos/declarative/declarative.pro
index 037ad85f03..4d169e3f67 100644
--- a/demos/declarative/declarative.pro
+++ b/demos/declarative/declarative.pro
@@ -1,9 +1,17 @@
 TEMPLATE = subdirs
-SUBDIRS = calculator \
-    flickr \
-    minehunt \
-    samegame \
-    snake \
-    twitter \
-    webbrowser
+
+# These demos contain C++ and need to be compiled
+SUBDIRS = \
+    minehunt
+
+# These examples contain no C++ and can simply be copied
+sources.files = \
+   calculator \
+   flickr \
+   samegame \
+   snake \
+   twitter \
+   webbrowser
+sources.path = $$[QT_INSTALL_DEMOS]/declarative
+INSTALLS += sources
 
diff --git a/demos/declarative/flickr/flickr.pro b/demos/declarative/flickr/flickr.pro
deleted file mode 100644
index c4c1d44060..0000000000
--- a/demos/declarative/flickr/flickr.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-TEMPLATE=app
-CONFIG -= qt separate_debug_info
-LIBS =
-QT =
-QMAKE_LINK = @: dummy
-
-sources.files = \
-    flickr-desktop.qml \
-    flickr-mobile-90.qml \
-    flickr-mobile.qml \
-    common \
-    mobile
-
-sources.path = $$[QT_INSTALL_DEMOS]/declarative/flickr
-INSTALLS = sources
-
diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro
index 2f9a8add6c..2df33e6cc8 100644
--- a/demos/declarative/minehunt/minehunt.pro
+++ b/demos/declarative/minehunt/minehunt.pro
@@ -10,7 +10,7 @@ DESTDIR = MinehuntCore
 SOURCES += minehunt.cpp
 
 
-sources.files = minehunt.qml
+sources.files = minehunt.qml minehunt.pro
 sources.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt
 
 target.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt/MinehuntCore
diff --git a/demos/declarative/snake/snake.pro b/demos/declarative/snake/snake.pro
deleted file mode 100644
index a206fd42b8..0000000000
--- a/demos/declarative/snake/snake.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE=app
-CONFIG -= qt separate_debug_info
-LIBS =
-QT =
-QMAKE_LINK = @: dummy
-
-sources.files = \
-    content \
-    snake.qml
-
-sources.path = $$[QT_INSTALL_DEMOS]/declarative/snake
-INSTALLS = sources
-
diff --git a/demos/declarative/twitter/twitter.pro b/demos/declarative/twitter/twitter.pro
deleted file mode 100644
index e1dd821a7b..0000000000
--- a/demos/declarative/twitter/twitter.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE=app
-CONFIG -= qt separate_debug_info
-LIBS =
-QT =
-QMAKE_LINK = @: dummy
-
-sources.files = \
-    TwitterCore \
-    twitter.qml 
-
-sources.path = $$[QT_INSTALL_DEMOS]/declarative/twitter
-INSTALLS = sources
-
diff --git a/demos/declarative/webbrowser/webbrowser.pro b/demos/declarative/webbrowser/webbrowser.pro
deleted file mode 100644
index c033ef949c..0000000000
--- a/demos/declarative/webbrowser/webbrowser.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE=app
-CONFIG -= qt separate_debug_info
-LIBS =
-QT =
-QMAKE_LINK = @: dummy
-
-sources.files = \
-    content \
-    webbrowser.qml 
-
-sources.path = $$[QT_INSTALL_DEMOS]/declarative/webbrowser
-INSTALLS = sources
-