Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging

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
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
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
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