From aba67cc3f020f03d8ed8ef5303d413044031bc58 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 22 Nov 2012 11:33:28 +0100 Subject: Fix installation of examples. Enable examples to be built in the target tree. This entails installing the project files and possibly other missing stuff. Task-number: QTBUG-27977 Change-Id: I159fd8e3ebc7077e1d68e085c4947acc058ce594 Reviewed-by: Friedemann Kleint Reviewed-by: hjk --- examples/quick/accessibility/accessibility.pro | 5 +++-- examples/quick/animation/animation.pro | 4 +++- examples/quick/canvas/canvas.pro | 4 +++- examples/quick/customitems/customitems.pro | 5 +++++ .../quick/customitems/maskedmousearea/maskedmousearea.pro | 9 +++++---- examples/quick/customitems/painteditem/painteditem.pro | 13 ++++++------- examples/quick/draganddrop/draganddrop.pro | 5 +++-- examples/quick/imageelements/imageelements.pro | 5 +++-- examples/quick/keyinteraction/keyinteraction.pro | 5 +++-- examples/quick/modelviews/modelviews.pro | 5 +++-- examples/quick/mousearea/mousearea.pro | 5 +++-- examples/quick/positioners/positioners.pro | 5 +++-- examples/quick/quick.pro | 5 +++++ examples/quick/righttoleft/righttoleft.pro | 5 +++-- examples/quick/scenegraph/customgeometry/customgeometry.pro | 4 ++++ examples/quick/scenegraph/openglunderqml/openglunderqml.pro | 5 +++++ examples/quick/scenegraph/scenegraph.pro | 5 ++++- examples/quick/scenegraph/simplematerial/simplematerial.pro | 5 +++++ examples/quick/shadereffects/shadereffects.pro | 5 +++-- examples/quick/text/text.pro | 5 +++-- examples/quick/threading/threading.pro | 5 +++-- examples/quick/touchinteraction/touchinteraction.pro | 5 +++-- 22 files changed, 81 insertions(+), 38 deletions(-) (limited to 'examples/quick') diff --git a/examples/quick/accessibility/accessibility.pro b/examples/quick/accessibility/accessibility.pro index 3f2109eac2..681e44b307 100644 --- a/examples/quick/accessibility/accessibility.pro +++ b/examples/quick/accessibility/accessibility.pro @@ -6,5 +6,6 @@ SOURCES += main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/accessibility qml.files = accessibility.qml content qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/accessibility -INSTALLS += target qml - +sources.files = $$SOURCES accessibility.pro +sources.path = $$qml.path +INSTALLS += sources target qml diff --git a/examples/quick/animation/animation.pro b/examples/quick/animation/animation.pro index c840bdf720..edc767d709 100644 --- a/examples/quick/animation/animation.pro +++ b/examples/quick/animation/animation.pro @@ -6,5 +6,7 @@ SOURCES += main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/animation qml.files = animation.qml basics behaviors easing pathanimation pathinterpolator states qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/animation -INSTALLS += target qml +sources.files = $$SOURCES animation.pro +sources.path = $$qml.path +INSTALLS += sources target qml diff --git a/examples/quick/canvas/canvas.pro b/examples/quick/canvas/canvas.pro index fe7ce9a37a..9f024237a2 100644 --- a/examples/quick/canvas/canvas.pro +++ b/examples/quick/canvas/canvas.pro @@ -6,4 +6,6 @@ SOURCES += main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/canvas qml.files = canvas.qml bezierCurve clip quadraticCurveTo roundedrect smile squircle tiger contents qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/canvas -INSTALLS += target qml \ No newline at end of file +sources.files = $$SOURCES canvas.pro +sources.path = $$qml.path +INSTALLS += sources target qml diff --git a/examples/quick/customitems/customitems.pro b/examples/quick/customitems/customitems.pro index 68a240cb5c..a401042d4e 100644 --- a/examples/quick/customitems/customitems.pro +++ b/examples/quick/customitems/customitems.pro @@ -10,3 +10,8 @@ SUBDIRS = \ #spinner \ #tabwidget \ maskedmousearea + +# install +sources.files = customitems.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems +INSTALLS += sources diff --git a/examples/quick/customitems/maskedmousearea/maskedmousearea.pro b/examples/quick/customitems/maskedmousearea/maskedmousearea.pro index 654c3ceeb5..b812508bd7 100644 --- a/examples/quick/customitems/maskedmousearea/maskedmousearea.pro +++ b/examples/quick/customitems/maskedmousearea/maskedmousearea.pro @@ -7,8 +7,9 @@ HEADERS += maskedmousearea.h SOURCES += main.cpp \ maskedmousearea.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/maskedmousearea +target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems/maskedmousearea qml.files = maskedmousearea.qml images -qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/maskedmousearea -INSTALLS += target qml - +qml.path = $$target.path +sources.files = $$SOURCES $$HEADERS maskedmousearea.pro +sources.path = $$qml.path +INSTALLS += sources target qml diff --git a/examples/quick/customitems/painteditem/painteditem.pro b/examples/quick/customitems/painteditem/painteditem.pro index 59b0702547..846ad6307d 100644 --- a/examples/quick/customitems/painteditem/painteditem.pro +++ b/examples/quick/customitems/painteditem/painteditem.pro @@ -13,13 +13,12 @@ OTHER_FILES += textballoon.json DESTDIR = TextBalloonPlugin +INSTALL_PATH = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/customitems/painteditem/ qdeclarativesources.files += \ - TextBalloonPlugin/qmldir - -qdeclarativesources.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/painteditem/TextBalloonPlugin - -sources.files = textballoons.qml -sources.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/painteditem -target.path += $$[QT_INSTALL_EXAMPLES]/qtquick/qml/painteditem/TextBalloonPlugin + TextBalloonPlugin/qmldir TextBalloonPlugin/plugin.h +qdeclarativesources.path += $$INSTALL_PATH/TextBalloonPlugin +sources.files = textballoons.qml $$SOURCES textballoon.h $$OTHER_FILES painteditem.pro +sources.path = $$INSTALL_PATH +target.path = $$INSTALL_PATH/TextBalloonPlugin INSTALLS = qdeclarativesources sources target diff --git a/examples/quick/draganddrop/draganddrop.pro b/examples/quick/draganddrop/draganddrop.pro index 3db32e0dd4..7ec3e0e58a 100644 --- a/examples/quick/draganddrop/draganddrop.pro +++ b/examples/quick/draganddrop/draganddrop.pro @@ -6,5 +6,6 @@ SOURCES += main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/draganddrop qml.files = draganddrop.qml tiles views qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/draganddrop -INSTALLS += target qml - +sources.files = $$SOURCES draganddrop.pro +sources.path = $$qml.path +INSTALLS += sources target qml diff --git a/examples/quick/imageelements/imageelements.pro b/examples/quick/imageelements/imageelements.pro index b395490858..eddfb7429a 100644 --- a/examples/quick/imageelements/imageelements.pro +++ b/examples/quick/imageelements/imageelements.pro @@ -6,5 +6,6 @@ SOURCES += main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/imageelements qml.files = *.qml content qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/imageelements -INSTALLS += target qml - +sources.files = $$SOURCES imageelements.pro +sources.path = $$qml.path +INSTALLS += sources target qml diff --git a/examples/quick/keyinteraction/keyinteraction.pro b/examples/quick/keyinteraction/keyinteraction.pro index d98f218673..740001362e 100644 --- a/examples/quick/keyinteraction/keyinteraction.pro +++ b/examples/quick/keyinteraction/keyinteraction.pro @@ -6,5 +6,6 @@ SOURCES += main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/keyinteraction qml.files = keyinteraction.qml focus qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/keyinteraction -INSTALLS += target qml - +sources.files = $$SOURCES keyinteraction.pro +sources.path = $$qml.path +INSTALLS += sources target qml diff --git a/examples/quick/modelviews/modelviews.pro b/examples/quick/modelviews/modelviews.pro index 7da02de774..695c010263 100644 --- a/examples/quick/modelviews/modelviews.pro +++ b/examples/quick/modelviews/modelviews.pro @@ -14,5 +14,6 @@ qml.files = \ visualdatamodel \ visualitemmodel qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/modelviews -INSTALLS += target qml - +sources.files = $$SOURCES modelviews.pro +sources.path = $$qml.path +INSTALLS += sources target qml diff --git a/examples/quick/mousearea/mousearea.pro b/examples/quick/mousearea/mousearea.pro index bf08c745bb..cb876e41b5 100644 --- a/examples/quick/mousearea/mousearea.pro +++ b/examples/quick/mousearea/mousearea.pro @@ -6,5 +6,6 @@ SOURCES += main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/mousearea qml.files = mousearea.qml qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/mousearea -INSTALLS += target qml - +sources.files = $$SOURCES mousearea.pro +sources.path = $$qml.path +INSTALLS += sources target qml diff --git a/examples/quick/positioners/positioners.pro b/examples/quick/positioners/positioners.pro index 2f457e60ff..e219cdea7a 100644 --- a/examples/quick/positioners/positioners.pro +++ b/examples/quick/positioners/positioners.pro @@ -6,5 +6,6 @@ SOURCES += main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/positioners qml.files = positioners.qml positioners-transitions.qml positioners-attachedproperties.qml qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/positioners -INSTALLS += target qml - +sources.files = $$SOURCES positioners.pro +sources.path = $$qml.path +INSTALLS += sources target qml diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro index 3884c7f179..2f0d430917 100644 --- a/examples/quick/quick.pro +++ b/examples/quick/quick.pro @@ -15,3 +15,8 @@ SUBDIRS = accessibility \ threading \ touchinteraction \ customitems + +# install +sources.files = quick.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick +INSTALLS += sources diff --git a/examples/quick/righttoleft/righttoleft.pro b/examples/quick/righttoleft/righttoleft.pro index 74005b1b08..d22aa0f5ff 100644 --- a/examples/quick/righttoleft/righttoleft.pro +++ b/examples/quick/righttoleft/righttoleft.pro @@ -6,5 +6,6 @@ SOURCES += main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/righttoleft qml.files = righttoleft.qml layoutdirection layoutmirroring textalignment qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/righttoleft -INSTALLS += target qml - +sources.files = $$SOURCES righttoleft.pro +sources.path = $$qml.path +INSTALLS += sources target qml diff --git a/examples/quick/scenegraph/customgeometry/customgeometry.pro b/examples/quick/scenegraph/customgeometry/customgeometry.pro index 8657820493..d1271e16a5 100644 --- a/examples/quick/scenegraph/customgeometry/customgeometry.pro +++ b/examples/quick/scenegraph/customgeometry/customgeometry.pro @@ -8,3 +8,7 @@ SOURCES += \ HEADERS += \ beziercurve.h +sources.files = $$SOURCES $$HEADERS customgeometry.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph/customgeometry +target.path = $$sources.path +INSTALLS += sources target diff --git a/examples/quick/scenegraph/openglunderqml/openglunderqml.pro b/examples/quick/scenegraph/openglunderqml/openglunderqml.pro index 64a58b3729..f2ad3d0d85 100644 --- a/examples/quick/scenegraph/openglunderqml/openglunderqml.pro +++ b/examples/quick/scenegraph/openglunderqml/openglunderqml.pro @@ -4,3 +4,8 @@ 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 diff --git a/examples/quick/scenegraph/scenegraph.pro b/examples/quick/scenegraph/scenegraph.pro index 96ffbd4fa4..22506bcfeb 100644 --- a/examples/quick/scenegraph/scenegraph.pro +++ b/examples/quick/scenegraph/scenegraph.pro @@ -1,4 +1,7 @@ - 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 10dec9996b..d8a638ca06 100644 --- a/examples/quick/scenegraph/simplematerial/simplematerial.pro +++ b/examples/quick/scenegraph/simplematerial/simplematerial.pro @@ -6,3 +6,8 @@ SOURCES += \ OTHER_FILES += \ test.qml + +sources.files = $$SOURCES $$OTHER_FILES simplematerial.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/scenegraph/simplematerial +target.path = $$sources.path +INSTALLS += sources target diff --git a/examples/quick/shadereffects/shadereffects.pro b/examples/quick/shadereffects/shadereffects.pro index d3b50632c7..e85ccad38d 100644 --- a/examples/quick/shadereffects/shadereffects.pro +++ b/examples/quick/shadereffects/shadereffects.pro @@ -6,5 +6,6 @@ SOURCES += main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/shadereffects qml.files = shadereffects.qml content qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/shadereffects -INSTALLS += target qml - +sources.files = $$SOURCES shadereffects.pro +sources.path = $$qml.path +INSTALLS += sources target qml diff --git a/examples/quick/text/text.pro b/examples/quick/text/text.pro index afd7d1ba07..b3734e29f3 100644 --- a/examples/quick/text/text.pro +++ b/examples/quick/text/text.pro @@ -6,5 +6,6 @@ SOURCES += main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/text qml.files = fonts imgtag styledtext-layout.qml text.qml textselection qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/text -INSTALLS += target qml - +sources.files = $$SOURCES text.pro +sources.path = $$qml.path +INSTALLS += sources target qml diff --git a/examples/quick/threading/threading.pro b/examples/quick/threading/threading.pro index a0770c9332..303a13cbaf 100644 --- a/examples/quick/threading/threading.pro +++ b/examples/quick/threading/threading.pro @@ -6,5 +6,6 @@ SOURCES += main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/threading qml.files = threading.qml threadedlistmodel workerscript qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/threading -INSTALLS += target qml - +sources.files = $$SOURCES threading.pro +sources.path = $$qml.path +INSTALLS += sources target qml diff --git a/examples/quick/touchinteraction/touchinteraction.pro b/examples/quick/touchinteraction/touchinteraction.pro index 6b52d46a25..83919c4e8f 100644 --- a/examples/quick/touchinteraction/touchinteraction.pro +++ b/examples/quick/touchinteraction/touchinteraction.pro @@ -6,5 +6,6 @@ SOURCES += main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/touchinteraction qml.files = flickable multipointtouch pincharea touchinteraction.qml qml.path = $$[QT_INSTALL_EXAMPLES]/qtquick/quick/touchinteraction -INSTALLS += target qml - +sources.files = $$SOURCES touchinteraction.pro +sources.path = $$qml.path +INSTALLS += sources target qml -- cgit v1.2.3