summaryrefslogtreecommitdiffstats
path: root/examples/declarative
diff options
context:
space:
mode:
authorDaniel Molkentin <daniel.molkentin@nokia.com>2011-11-22 12:48:40 (GMT)
committerDaniel Molkentin <daniel.molkentin@nokia.com>2011-11-22 13:22:58 (GMT)
commitc6b06f07d4fdd62698e91ece75acba1f2c1748cc (patch)
treeb54b5142d08274effaa1f69aa60b2f7d2fed1629 /examples/declarative
parent2f4d684267f23992e656d183bde6f8c6773e5a6d (diff)
downloadQt-c6b06f07d4fdd62698e91ece75acba1f2c1748cc.zip
Qt-c6b06f07d4fdd62698e91ece75acba1f2c1748cc.tar.gz
Qt-c6b06f07d4fdd62698e91ece75acba1f2c1748cc.tar.bz2
Fix "make install" for declarative examples
Reviewed-by: Oswald Buddenhagen
Diffstat (limited to 'examples/declarative')
-rw-r--r--examples/declarative/animation/animation.pro8
-rw-r--r--examples/declarative/declarative.pro24
-rw-r--r--examples/declarative/imageelements/imageelements.pro6
-rw-r--r--examples/declarative/text/fonts/fonts.pro7
-rw-r--r--examples/declarative/text/text.pro5
-rw-r--r--examples/declarative/threading/threading.pro5
-rw-r--r--examples/declarative/touchinteraction/touchinteraction.pro4
-rw-r--r--examples/declarative/toys/toys.pro8
-rw-r--r--examples/declarative/ui-components/ui-components.pro11
9 files changed, 64 insertions, 14 deletions
diff --git a/examples/declarative/animation/animation.pro b/examples/declarative/animation/animation.pro
new file mode 100644
index 0000000..a71df66
--- /dev/null
+++ b/examples/declarative/animation/animation.pro
@@ -0,0 +1,8 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+ basics/property-animation \
+ basics/color-animation \
+ easing \
+ behaviors/behavior-example \
+ states
diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro
index f10e7a4..684dd2a 100644
--- a/examples/declarative/declarative.pro
+++ b/examples/declarative/declarative.pro
@@ -2,9 +2,20 @@ TEMPLATE = subdirs
# These examples contain some C++ and need to be built
SUBDIRS = \
+ animation \
cppextensions \
modelviews \
- tutorials
+ i18n \
+ imageelements \
+ keyinteraction/focus \
+ positioners \
+ sqllocalstorage \
+ text \
+ threading \
+ tutorials \
+ touchinteraction \
+ toys \
+ ui-components
# OpenGL shader examples requires opengl and they contain some C++ and need to be built
contains(QT_CONFIG, opengl): SUBDIRS += shadereffects
@@ -14,18 +25,7 @@ symbian:SUBDIRS -= plugins
# These examples contain no C++ and can simply be copied
sources.files = \
- animation \
cppextensions \
- i18n \
- imageelements \
- keyinteraction \
- positioners \
- sqllocalstorage \
- text \
- threading \
- touchinteraction \
- toys \
- ui-components \
xml
sources.path = $$[QT_INSTALL_EXAMPLES]/declarative
diff --git a/examples/declarative/imageelements/imageelements.pro b/examples/declarative/imageelements/imageelements.pro
new file mode 100644
index 0000000..8aa9920
--- /dev/null
+++ b/examples/declarative/imageelements/imageelements.pro
@@ -0,0 +1,6 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+ borderimage \
+ image \
+ shadows
diff --git a/examples/declarative/text/fonts/fonts.pro b/examples/declarative/text/fonts/fonts.pro
new file mode 100644
index 0000000..3710ab2
--- /dev/null
+++ b/examples/declarative/text/fonts/fonts.pro
@@ -0,0 +1,7 @@
+TEMPLATE += subdirs
+
+SUBDIRS += \
+ availableFonts \
+ banner \
+ fonts \
+ hello
diff --git a/examples/declarative/text/text.pro b/examples/declarative/text/text.pro
new file mode 100644
index 0000000..4e86deb
--- /dev/null
+++ b/examples/declarative/text/text.pro
@@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+ fonts \
+ textselection
diff --git a/examples/declarative/threading/threading.pro b/examples/declarative/threading/threading.pro
new file mode 100644
index 0000000..5650861
--- /dev/null
+++ b/examples/declarative/threading/threading.pro
@@ -0,0 +1,5 @@
+TEMPLATE = subdirs
+
+SUBDIRS = \
+ threadedlistmodel \
+ workerscript
diff --git a/examples/declarative/touchinteraction/touchinteraction.pro b/examples/declarative/touchinteraction/touchinteraction.pro
index 1beaeab..5ce0abe 100644
--- a/examples/declarative/touchinteraction/touchinteraction.pro
+++ b/examples/declarative/touchinteraction/touchinteraction.pro
@@ -1,4 +1,4 @@
TEMPLATE = subdirs
-SUBDIRS = gestures \
- mousearea \
+SUBDIRS = gestures/experimental-gestures \
+ mousearea/mousearea-example \
pincharea
diff --git a/examples/declarative/toys/toys.pro b/examples/declarative/toys/toys.pro
new file mode 100644
index 0000000..5c7f70b
--- /dev/null
+++ b/examples/declarative/toys/toys.pro
@@ -0,0 +1,8 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+ clocks \
+ corkboards \
+ dynamicscene \
+ tic-tac-toe \
+ tvtennis
diff --git a/examples/declarative/ui-components/ui-components.pro b/examples/declarative/ui-components/ui-components.pro
new file mode 100644
index 0000000..62d1cdf
--- /dev/null
+++ b/examples/declarative/ui-components/ui-components.pro
@@ -0,0 +1,11 @@
+TEMPLATE = subdirs
+
+SUBDIRS += dialcontrol \
+ flipable \
+ main \
+ progressbar \
+ scrollbar \
+ searchbox \
+ slideswitch \
+ spinner \
+ tabwidget