diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-29 16:02:34 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-10 18:16:48 +0100 |
| commit | a6065d60f158ffad7a94877883af69731da94295 (patch) | |
| tree | 5657fd490fd8a3f9794a8c9bcc9f85cf24a095c1 /examples/quick/scenegraph | |
| parent | c18e04b2e61f174a4883f6884cf9a0712c5725e3 (diff) | |
centralize and fixup example sources install targets
follow respective change in qtbase
Change-Id: I27502eb7ebea973e19ec5f7c3ec0e2338556f6e0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
Diffstat (limited to 'examples/quick/scenegraph')
4 files changed, 12 insertions, 22 deletions
diff --git a/examples/quick/scenegraph/customgeometry/customgeometry.pro b/examples/quick/scenegraph/customgeometry/customgeometry.pro index 5198a3c44a..8044c5c034 100644 --- a/examples/quick/scenegraph/customgeometry/customgeometry.pro +++ b/examples/quick/scenegraph/customgeometry/customgeometry.pro @@ -8,9 +8,8 @@ SOURCES += \ HEADERS += \ beziercurve.h -OTHER_FILES += main.qml +target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/customgeometry +qml.files = main.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/customgeometry -sources.files = $$SOURCES $$HEADERS $$OTHER_FILES customgeometry.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph/customgeometry -target.path = $$sources.path -INSTALLS += sources target +INSTALLS += target qml diff --git a/examples/quick/scenegraph/openglunderqml/openglunderqml.pro b/examples/quick/scenegraph/openglunderqml/openglunderqml.pro index f2ad3d0d85..f86dd5f5f3 100644 --- a/examples/quick/scenegraph/openglunderqml/openglunderqml.pro +++ b/examples/quick/scenegraph/openglunderqml/openglunderqml.pro @@ -3,9 +3,7 @@ QT += qml quick HEADERS += squircle.h SOURCES += squircle.cpp main.cpp -OTHER_FILES += main.qml - -sources.files = $$SOURCES $$HEADERS $$OTHER_FILES openglunderqml.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph/openglunderqml -target.path = $$sources.path -INSTALLS += sources target +target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/openglunderqml +qml.files = main.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/openglunderqml +INSTALLS += target qml diff --git a/examples/quick/scenegraph/scenegraph.pro b/examples/quick/scenegraph/scenegraph.pro index 22506bcfeb..88b8d03dc3 100644 --- a/examples/quick/scenegraph/scenegraph.pro +++ b/examples/quick/scenegraph/scenegraph.pro @@ -1,7 +1,2 @@ TEMPLATE = subdirs SUBDIRS += customgeometry simplematerial openglunderqml - -# install -sources.files = scenegraph.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph -INSTALLS += sources diff --git a/examples/quick/scenegraph/simplematerial/simplematerial.pro b/examples/quick/scenegraph/simplematerial/simplematerial.pro index f8be76132e..ae4fb0fdd0 100644 --- a/examples/quick/scenegraph/simplematerial/simplematerial.pro +++ b/examples/quick/scenegraph/simplematerial/simplematerial.pro @@ -4,10 +4,8 @@ QT += quick SOURCES += \ simplematerial.cpp -OTHER_FILES += \ - main.qml +target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/simplematerial +qml.files = main.qml +qml.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/simplematerial -sources.files = $$SOURCES $$OTHER_FILES simplematerial.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph/simplematerial -target.path = $$sources.path -INSTALLS += sources target +INSTALLS += target qml |