diff options
author | Oliver Wolff <oliver.wolff@digia.com> | 2012-12-05 11:42:20 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-11 18:25:53 +0100 |
commit | 04cb8ef1ee919f071540ccb5cae10bb47f37fb3e (patch) | |
tree | 2e9aa7b3e908b00870d17a93023bd622fcd80c7a /examples/declarative/animation | |
parent | 60c101b9907479e8bb6aa9770114572a72434dc6 (diff) |
centralize and fixup example sources install targets
follow respective change in qtbase
Change-Id: I15346e16cd1d6f30cf32a77284b5f19b1dd2a7a9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'examples/declarative/animation')
7 files changed, 13 insertions, 17 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 e110924e..f8c2b129 100644 --- a/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro +++ b/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro @@ -26,7 +26,7 @@ QML_IMPORT_PATH = 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() |