summaryrefslogtreecommitdiffstats
path: root/examples/declarative
diff options
context:
space:
mode:
authorKevin Wright <kevin.wright@nokia.com>2011-11-24 17:01:15 (GMT)
committerKevin Wright <kevin.wright@nokia.com>2011-11-24 17:01:15 (GMT)
commitdf3181143415276f7bc208f74c17e7457b65c688 (patch)
tree27ebda09063455c319ca56f82597499b53204b5a /examples/declarative
parent234f96a92b8f7de0b06d9711ce7f47dfb1d8dda6 (diff)
parent455752fcf3e6c40a5ac8e6ea759333057d7aca74 (diff)
downloadQt-df3181143415276f7bc208f74c17e7457b65c688.zip
Qt-df3181143415276f7bc208f74c17e7457b65c688.tar.gz
Qt-df3181143415276f7bc208f74c17e7457b65c688.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
Diffstat (limited to 'examples/declarative')
-rw-r--r--examples/declarative/animation/basics/color-animation/color-animation.png (renamed from examples/declarative/animation/behaviors/behavior-example/behaviorexample.png)bin3400 -> 3400 bytes
-rw-r--r--examples/declarative/animation/basics/color-animation/color-animation.pro (renamed from examples/declarative/animation/basics/color-animation/coloranimation.pro)10
-rw-r--r--examples/declarative/animation/basics/color-animation/color-animation.svg (renamed from examples/declarative/animation/behaviors/behavior-example/behaviorexample.svg)0
-rw-r--r--examples/declarative/animation/basics/property-animation/property-animation.png (renamed from examples/declarative/animation/basics/property-animation/propertyanimation.png)bin3400 -> 3400 bytes
-rw-r--r--examples/declarative/animation/basics/property-animation/property-animation.pro (renamed from examples/declarative/animation/basics/property-animation/propertyanimation.pro)0
-rw-r--r--examples/declarative/animation/basics/property-animation/property-animation.svg (renamed from examples/declarative/animation/basics/property-animation/propertyanimation.svg)0
-rw-r--r--examples/declarative/animation/behaviors/behavior-example/behavior-example.png (renamed from examples/declarative/animation/basics/color-animation/coloranimation.png)bin3400 -> 3400 bytes
-rw-r--r--examples/declarative/animation/behaviors/behavior-example/behavior-example.pro (renamed from examples/declarative/animation/behaviors/behavior-example/behaviorexample.pro)0
-rw-r--r--examples/declarative/animation/behaviors/behavior-example/behavior-example.svg (renamed from examples/declarative/animation/basics/color-animation/coloranimation.svg)0
9 files changed, 10 insertions, 0 deletions
diff --git a/examples/declarative/animation/behaviors/behavior-example/behaviorexample.png b/examples/declarative/animation/basics/color-animation/color-animation.png
index 707d5c4..707d5c4 100644
--- a/examples/declarative/animation/behaviors/behavior-example/behaviorexample.png
+++ b/examples/declarative/animation/basics/color-animation/color-animation.png
Binary files differ
diff --git a/examples/declarative/animation/basics/color-animation/coloranimation.pro b/examples/declarative/animation/basics/color-animation/color-animation.pro
index 7e0f050..0272cdb 100644
--- a/examples/declarative/animation/basics/color-animation/coloranimation.pro
+++ b/examples/declarative/animation/basics/color-animation/color-animation.pro
@@ -39,3 +39,13 @@ desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/basics/color-
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
+
+OTHER_FILES += \
+ qtc_packaging/debian_harmattan/rules \
+ qtc_packaging/debian_harmattan/README \
+ qtc_packaging/debian_harmattan/manifest.aegis \
+ qtc_packaging/debian_harmattan/copyright \
+ qtc_packaging/debian_harmattan/control \
+ qtc_packaging/debian_harmattan/compat \
+ qtc_packaging/debian_harmattan/changelog
+
diff --git a/examples/declarative/animation/behaviors/behavior-example/behaviorexample.svg b/examples/declarative/animation/basics/color-animation/color-animation.svg
index 566acfa..566acfa 100644
--- a/examples/declarative/animation/behaviors/behavior-example/behaviorexample.svg
+++ b/examples/declarative/animation/basics/color-animation/color-animation.svg
diff --git a/examples/declarative/animation/basics/property-animation/propertyanimation.png b/examples/declarative/animation/basics/property-animation/property-animation.png
index 707d5c4..707d5c4 100644
--- a/examples/declarative/animation/basics/property-animation/propertyanimation.png
+++ b/examples/declarative/animation/basics/property-animation/property-animation.png
Binary files differ
diff --git a/examples/declarative/animation/basics/property-animation/propertyanimation.pro b/examples/declarative/animation/basics/property-animation/property-animation.pro
index 82341e5..82341e5 100644
--- a/examples/declarative/animation/basics/property-animation/propertyanimation.pro
+++ b/examples/declarative/animation/basics/property-animation/property-animation.pro
diff --git a/examples/declarative/animation/basics/property-animation/propertyanimation.svg b/examples/declarative/animation/basics/property-animation/property-animation.svg
index 566acfa..566acfa 100644
--- a/examples/declarative/animation/basics/property-animation/propertyanimation.svg
+++ b/examples/declarative/animation/basics/property-animation/property-animation.svg
diff --git a/examples/declarative/animation/basics/color-animation/coloranimation.png b/examples/declarative/animation/behaviors/behavior-example/behavior-example.png
index 707d5c4..707d5c4 100644
--- a/examples/declarative/animation/basics/color-animation/coloranimation.png
+++ b/examples/declarative/animation/behaviors/behavior-example/behavior-example.png
Binary files differ
diff --git a/examples/declarative/animation/behaviors/behavior-example/behaviorexample.pro b/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro
index 3ea81e2..3ea81e2 100644
--- a/examples/declarative/animation/behaviors/behavior-example/behaviorexample.pro
+++ b/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro
diff --git a/examples/declarative/animation/basics/color-animation/coloranimation.svg b/examples/declarative/animation/behaviors/behavior-example/behavior-example.svg
index 566acfa..566acfa 100644
--- a/examples/declarative/animation/basics/color-animation/coloranimation.svg
+++ b/examples/declarative/animation/behaviors/behavior-example/behavior-example.svg