diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2011-11-21 12:24:20 (GMT) |
|---|---|---|
| committer | Daniel Molkentin <daniel.molkentin@nokia.com> | 2011-11-21 12:50:57 (GMT) |
| commit | 0b594c27b946eb8c2356f1400e3dfb72be824588 (patch) | |
| tree | 627374251c5a14659fb8543ee98f46d46c761ebb /examples/declarative/animation | |
| parent | 7eb8de4dde6df60b26e5297407573f01634415c3 (diff) | |
| download | Qt-0b594c27b946eb8c2356f1400e3dfb72be824588.zip Qt-0b594c27b946eb8c2356f1400e3dfb72be824588.tar.gz Qt-0b594c27b946eb8c2356f1400e3dfb72be824588.tar.bz2 | |
Fix use of qmlapplicationviewer.
- Two separate copies for demos and example
- Fix deployment (don't install to opt in desktop case)
Reviewed-by: Casper van Donderen
Diffstat (limited to 'examples/declarative/animation')
5 files changed, 10 insertions, 5 deletions
diff --git a/examples/declarative/animation/basics/color-animation/coloranimation.pro b/examples/declarative/animation/basics/color-animation/coloranimation.pro index a6ce3f6..0a34190 100644 --- a/examples/declarative/animation/basics/color-animation/coloranimation.pro +++ b/examples/declarative/animation/basics/color-animation/coloranimation.pro @@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE959F610 SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri) +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/basics/color-animation +include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/animation/basics/property-animation/propertyanimation.pro b/examples/declarative/animation/basics/property-animation/propertyanimation.pro index e4e9471..f79f1cb 100644 --- a/examples/declarative/animation/basics/property-animation/propertyanimation.pro +++ b/examples/declarative/animation/basics/property-animation/propertyanimation.pro @@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE4032BC6 SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri) +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/basics/property-animation +include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/animation/behaviors/behavior-example/behaviorexample.pro b/examples/declarative/animation/behaviors/behavior-example/behaviorexample.pro index f1dc1aa..91b021f 100644 --- a/examples/declarative/animation/behaviors/behavior-example/behaviorexample.pro +++ b/examples/declarative/animation/behaviors/behavior-example/behaviorexample.pro @@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEB6022A4 SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -include(../../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri) +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/behaviors/behavior-example +include(../../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/animation/easing/easing.pro b/examples/declarative/animation/easing/easing.pro index 1f003b1..b3d1821 100644 --- a/examples/declarative/animation/easing/easing.pro +++ b/examples/declarative/animation/easing/easing.pro @@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xEAA54148 SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri) +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/easing +include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() diff --git a/examples/declarative/animation/states/states.pro b/examples/declarative/animation/states/states.pro index 8239977..1f06e4b 100644 --- a/examples/declarative/animation/states/states.pro +++ b/examples/declarative/animation/states/states.pro @@ -35,5 +35,6 @@ symbian:TARGET.UID3 = 0xE9200E0A SOURCES += main.cpp # Please do not modify the following two lines. Required for deployment. -include(../../../tools/qmlapplicationviewer/qmlapplicationviewer.pri) +desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/animation/states +include(../../../helper/qmlapplicationviewer/qmlapplicationviewer.pri) qtcAddDeployment() |