summaryrefslogtreecommitdiffstats
path: root/examples/declarative/animation
diff options
context:
space:
mode:
Diffstat (limited to 'examples/declarative/animation')
-rw-r--r--examples/declarative/animation/animation.pro6
-rw-r--r--examples/declarative/animation/basics/color-animation/color-animation.pro4
-rw-r--r--examples/declarative/animation/basics/property-animation/property-animation.pro4
-rw-r--r--examples/declarative/animation/behaviors/behavior-example/behavior-example.pro4
-rw-r--r--examples/declarative/animation/behaviors/wigglytext/wigglytext.pro13
-rw-r--r--examples/declarative/animation/easing/easing.pro4
-rw-r--r--examples/declarative/animation/states/states.pro4
7 files changed, 13 insertions, 26 deletions
diff --git a/examples/declarative/animation/animation.pro b/examples/declarative/animation/animation.pro
index 6ac1b645..c9dca1de 100644
--- a/examples/declarative/animation/animation.pro
+++ b/examples/declarative/animation/animation.pro
@@ -5,9 +5,5 @@ SUBDIRS += \
basics/color-animation \
easing \
behaviors/behavior-example \
+ behaviors/wigglytext \
states
-
-# install
-sources.files = animation.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation
-INSTALLS += sources
diff --git a/examples/declarative/animation/basics/color-animation/color-animation.pro b/examples/declarative/animation/basics/color-animation/color-animation.pro
index 11dd9d13..f0e805e5 100644
--- a/examples/declarative/animation/basics/color-animation/color-animation.pro
+++ b/examples/declarative/animation/basics/color-animation/color-animation.pro
@@ -23,9 +23,9 @@ QML_IMPORT_PATH =
SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/basics/color-animation
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/basics/color-animation
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
-else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
+else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
OTHER_FILES += \
diff --git a/examples/declarative/animation/basics/property-animation/property-animation.pro b/examples/declarative/animation/basics/property-animation/property-animation.pro
index 28e7ebc3..0c2dcdb1 100644
--- a/examples/declarative/animation/basics/property-animation/property-animation.pro
+++ b/examples/declarative/animation/basics/property-animation/property-animation.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/basics/property-animation
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/basics/property-animation
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
-else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
+else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro b/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro
index b1b3cd6b..7430b0fc 100644
--- a/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro
+++ b/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/behaviors/behavior-example
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/behaviors/behavior-example
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
-else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
+else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro b/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro
index 4c46a119..f8c2b129 100644
--- a/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro
+++ b/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro
@@ -12,15 +12,6 @@ QML_IMPORT_PATH =
# Needs to be defined for Symbian
#DEFINES += NETWORKACCESS
-symbian:TARGET.UID3 = 0xEB6022A4
-
-# Smart Installer package's UID
-# This UID is from the protected range
-# and therefore the package will fail to install if self-signed
-# By default qmake uses the unprotected range value if unprotected UID is defined for the application
-# and 0x2002CCCF value if protected UID is given to the application
-#symbian:DEPLOYMENT.installer_header = 0x2002CCCF
-
# Define QMLJSDEBUGGER to allow debugging of QML in debug builds
# (This might significantly increase build time)
# DEFINES += QMLJSDEBUGGER
@@ -35,7 +26,7 @@ symbian:TARGET.UID3 = 0xEB6022A4
SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/animation/wigglytext/wigglytext
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/wigglytext/wigglytext
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
-else:include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
+else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/animation/easing/easing.pro b/examples/declarative/animation/easing/easing.pro
index ac80ef7a..63769634 100644
--- a/examples/declarative/animation/easing/easing.pro
+++ b/examples/declarative/animation/easing/easing.pro
@@ -23,7 +23,7 @@ DEFINES += ORIENTATIONLOCK
SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/easing
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/easing
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
-else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
+else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()
diff --git a/examples/declarative/animation/states/states.pro b/examples/declarative/animation/states/states.pro
index 9a469a68..7e9f48d3 100644
--- a/examples/declarative/animation/states/states.pro
+++ b/examples/declarative/animation/states/states.pro
@@ -23,7 +23,7 @@ QML_IMPORT_PATH =
SOURCES += main.cpp
# Please do not modify the following two lines. Required for deployment.
-desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/qtquick1/declarative/animation/states
+desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/states
exists(qmlapplicationviewer/qmlapplicationviewer.pri):include(qmlapplicationviewer/qmlapplicationviewer.pri)
-else:include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
+else:include(../../helper/qmlapplicationviewer/qmlapplicationviewer.pri)
qtcAddDeployment()