Fixed declarative demos not being installed.

(cherry picked from commit 23440d84ddf78755e77cea75956cd7445647230a)

8 files changed, 93 insertions, 0 deletions

diff --git a/demos/declarative/calculator/calculator.pro b/demos/declarative/calculator/calculator.pro
new file mode 100644
index 0000000000..efe641331f
--- /dev/null
+++ b/demos/declarative/calculator/calculator.pro
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000000..037ad85f03
--- /dev/null
+++ b/demos/declarative/declarative.pro
@@ -0,0 +1,9 @@
+TEMPLATE = subdirs
+SUBDIRS = calculator \
+    flickr \
+    minehunt \
+    samegame \
+    snake \
+    twitter \
+    webbrowser
+
diff --git a/demos/declarative/flickr/flickr.pro b/demos/declarative/flickr/flickr.pro
new file mode 100644
index 0000000000..c4c1d44060
--- /dev/null
+++ b/demos/declarative/flickr/flickr.pro
@@ -0,0 +1,16 @@
+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 a497b0fa9c..2f9a8add6c 100644
--- a/demos/declarative/minehunt/minehunt.pro
+++ b/demos/declarative/minehunt/minehunt.pro
@@ -9,3 +9,17 @@ DESTDIR = MinehuntCore
 # Input
 SOURCES += minehunt.cpp
 
+
+sources.files = minehunt.qml
+sources.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt
+
+target.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt/MinehuntCore
+
+MinehuntCore_sources.files = \
+    MinehuntCore/Explosion.qml \
+    MinehuntCore/pics \
+    MinehuntCore/qmldir
+MinehuntCore_sources.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt/MinehuntCore
+
+INSTALLS = sources MinehuntCore_sources target
+
diff --git a/demos/declarative/snake/snake.pro b/demos/declarative/snake/snake.pro
new file mode 100644
index 0000000000..a206fd42b8
--- /dev/null
+++ b/demos/declarative/snake/snake.pro
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000000..e1dd821a7b
--- /dev/null
+++ b/demos/declarative/twitter/twitter.pro
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000000..c033ef949c
--- /dev/null
+++ b/demos/declarative/webbrowser/webbrowser.pro
@@ -0,0 +1,13 @@
+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
+
diff --git a/demos/demos.pro b/demos/demos.pro
index 4c2318c9df..83e93559c4 100644
--- a/demos/demos.pro
+++ b/demos/demos.pro
@@ -56,6 +56,7 @@ wince*:SUBDIRS += demos_sqlbrowser
 contains(QT_CONFIG, phonon):!static:SUBDIRS += demos_mediaplayer
 contains(QT_CONFIG, webkit):contains(QT_CONFIG, svg):!symbian:SUBDIRS += demos_browser
 contains(QT_CONFIG, multimedia):SUBDIRS += demos_multimedia
+contains(QT_CONFIG, declarative):SUBDIRS += demos_declarative
 
 # install
 sources.files = README *.pro
@@ -84,6 +85,7 @@ demos_undo.subdir = undo
 demos_qtdemo.subdir = qtdemo
 demos_mediaplayer.subdir = qmediaplayer
 demos_multimedia.subdir = multimedia
+demos_declarative.subdir = declarative
 
 demos_browser.subdir = browser