From 23440d84ddf78755e77cea75956cd7445647230a Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Mon, 8 Mar 2010 11:52:26 +1000
Subject: Fixed declarative demos not being installed.

---
 demos/declarative/calculator/calculator.pro | 13 +++++++++++++
 demos/declarative/declarative.pro           |  9 +++++++++
 demos/declarative/flickr/flickr.pro         | 16 ++++++++++++++++
 demos/declarative/minehunt/minehunt.pro     | 14 ++++++++++++++
 demos/declarative/snake/snake.pro           | 13 +++++++++++++
 demos/declarative/twitter/twitter.pro       | 13 +++++++++++++
 demos/declarative/webbrowser/webbrowser.pro | 13 +++++++++++++
 demos/demos.pro                             |  2 ++
 8 files changed, 93 insertions(+)
 create mode 100644 demos/declarative/calculator/calculator.pro
 create mode 100644 demos/declarative/declarative.pro
 create mode 100644 demos/declarative/flickr/flickr.pro
 create mode 100644 demos/declarative/snake/snake.pro
 create mode 100644 demos/declarative/twitter/twitter.pro
 create mode 100644 demos/declarative/webbrowser/webbrowser.pro

diff --git a/demos/declarative/calculator/calculator.pro b/demos/declarative/calculator/calculator.pro
new file mode 100644
index 0000000..efe6413
--- /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 0000000..037ad85
--- /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 0000000..c4c1d44
--- /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 a497b0f..2f9a8ad 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 0000000..a206fd4
--- /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 0000000..e1dd821
--- /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 0000000..c033ef9
--- /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 4c2318c..83e9355 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
 
-- 
cgit v0.12