From 578d2717196cdf109d459c7a63b5085dc0791747 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 22 Apr 2016 20:47:58 +0200 Subject: make use of COPIES Change-Id: I479c9523a89be1d64364e8205daa5860e16882cc Reviewed-by: Simon Hausmann --- examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'examples/quick') diff --git a/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro index e88e8f670c..daac0e29eb 100644 --- a/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro +++ b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro @@ -21,5 +21,6 @@ SOURCES += \ OTHER_FILES += qmldir # Copy the qmldir file to the same folder as the plugin binary -QMAKE_POST_LINK += $$QMAKE_COPY $$shell_quote($$shell_path($$PWD/qmldir)) \ - $$shell_quote($$shell_path($$DESTDIR)) $$escape_expand(\\n\\t) +cpqmldir.files = $$PWD/qmldir +cpqmldir.path = $$DESTDIR +COPIES += cpqmldir -- cgit v1.2.3 From e6581ed818b72e06afddce555be20bd10979ce5e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 11 May 2016 14:41:47 +0200 Subject: fix example installs Change-Id: Ie6a219392a48fd6b1a32037cc215dc20d408e819 Reviewed-by: Simon Hausmann --- examples/quick/customitems/painteditem/painteditem.pro | 2 ++ examples/quick/imageprovider/imageprovider.pro | 2 ++ examples/quick/imageresponseprovider/imageresponseprovider.pro | 2 ++ examples/quick/quick-accessibility/quick-accessibility.pro | 3 +++ .../quick/quickwidgets/qquickviewcomparison/qquickviewcomparison.pro | 3 +++ examples/quick/quickwidgets/quickwidget/quickwidget.pro | 3 +++ examples/quick/scenegraph/graph/graph.pro | 2 ++ examples/quick/scenegraph/scenegraph.pro | 3 +++ examples/quick/window/window.pro | 3 ++- 9 files changed, 22 insertions(+), 1 deletion(-) (limited to 'examples/quick') diff --git a/examples/quick/customitems/painteditem/painteditem.pro b/examples/quick/customitems/painteditem/painteditem.pro index 3ec6420abf..bc7480ab9e 100644 --- a/examples/quick/customitems/painteditem/painteditem.pro +++ b/examples/quick/customitems/painteditem/painteditem.pro @@ -19,5 +19,7 @@ qmldir.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/TextBalloonP INSTALLS += qmldir target +CONFIG += install_ok # Do not cargo-cult this! + OTHER_FILES += \ textballoons.qml diff --git a/examples/quick/imageprovider/imageprovider.pro b/examples/quick/imageprovider/imageprovider.pro index 5567a2d6d9..e54469b0d8 100644 --- a/examples/quick/imageprovider/imageprovider.pro +++ b/examples/quick/imageprovider/imageprovider.pro @@ -13,3 +13,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProviderCore qml.files = ImageProviderCore/qmldir qml.path = $$[QT_INSTALL_EXAMPLES]/quick/imageprovider/ImageProviderCore INSTALLS = target qml + +CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/quick/imageresponseprovider/imageresponseprovider.pro b/examples/quick/imageresponseprovider/imageresponseprovider.pro index 856ddde863..8be4dbb658 100644 --- a/examples/quick/imageresponseprovider/imageresponseprovider.pro +++ b/examples/quick/imageresponseprovider/imageresponseprovider.pro @@ -13,3 +13,5 @@ target.path = $$[QT_INSTALL_EXAMPLES]/quick/imageresponseprovider/ImageResponseP qml.files = ImageResponseProviderCore/qmldir qml.path = $$[QT_INSTALL_EXAMPLES]/quick/imageresponseprovider/ImageResponseProviderCore INSTALLS = target qml + +CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/quick/quick-accessibility/quick-accessibility.pro b/examples/quick/quick-accessibility/quick-accessibility.pro index 70cf34b54c..cc9d48ac0f 100644 --- a/examples/quick/quick-accessibility/quick-accessibility.pro +++ b/examples/quick/quick-accessibility/quick-accessibility.pro @@ -6,3 +6,6 @@ RESOURCES += accessibility.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/quick-accessibility INSTALLS += target + +EXAMPLE_FILES += \ + accessibility.qmlproject diff --git a/examples/quick/quickwidgets/qquickviewcomparison/qquickviewcomparison.pro b/examples/quick/quickwidgets/qquickviewcomparison/qquickviewcomparison.pro index 9d70f7aa5a..80216da346 100644 --- a/examples/quick/quickwidgets/qquickviewcomparison/qquickviewcomparison.pro +++ b/examples/quick/quickwidgets/qquickviewcomparison/qquickviewcomparison.pro @@ -15,3 +15,6 @@ HEADERS += mainwindow.h \ RESOURCES += qquickviewcomparison.qrc OTHER_FILES += test.qml + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/quickwidgets/qquickviewcomparison +INSTALLS += target diff --git a/examples/quick/quickwidgets/quickwidget/quickwidget.pro b/examples/quick/quickwidgets/quickwidget/quickwidget.pro index 1aca22082e..04fb5541a7 100644 --- a/examples/quick/quickwidgets/quickwidget/quickwidget.pro +++ b/examples/quick/quickwidgets/quickwidget/quickwidget.pro @@ -6,3 +6,6 @@ TEMPLATE = app SOURCES += main.cpp RESOURCES += quickwidget.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/quickwidgets/quickwidget +INSTALLS += target diff --git a/examples/quick/scenegraph/graph/graph.pro b/examples/quick/scenegraph/graph/graph.pro index 5991f799dc..4699001f6a 100644 --- a/examples/quick/scenegraph/graph/graph.pro +++ b/examples/quick/scenegraph/graph/graph.pro @@ -32,3 +32,5 @@ OTHER_FILES += \ shaders/line.fsh \ shaders/line.vsh +target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/graph +INSTALLS += target diff --git a/examples/quick/scenegraph/scenegraph.pro b/examples/quick/scenegraph/scenegraph.pro index 1e7e74372d..b9665e6015 100644 --- a/examples/quick/scenegraph/scenegraph.pro +++ b/examples/quick/scenegraph/scenegraph.pro @@ -8,3 +8,6 @@ SUBDIRS += \ textureinthread \ threadedanimation \ twotextureproviders + +EXAMPLE_FILES += \ + shared diff --git a/examples/quick/window/window.pro b/examples/quick/window/window.pro index be35b24325..c3e9b080bb 100644 --- a/examples/quick/window/window.pro +++ b/examples/quick/window/window.pro @@ -6,7 +6,8 @@ RESOURCES += \ window.qrc \ ../shared/shared.qrc EXAMPLE_FILES = \ - window.qml + window.qml \ + resources target.path = $$[QT_INSTALL_EXAMPLES]/quick/window INSTALLS += target -- cgit v1.2.3 From ee874f7e0ac4a85d0e765ff5d134f8afd44bb8ae Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Apr 2016 16:49:12 +0200 Subject: actually build and install the qml tutorials MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Idf81981140e210b29239e91ff5b6b7c40e2f36de Reviewed-by: Topi Reiniö Reviewed-by: Simon Hausmann --- examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro | 4 +++- examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'examples/quick') diff --git a/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro index daac0e29eb..8f8f4549aa 100644 --- a/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro +++ b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro @@ -18,9 +18,11 @@ SOURCES += \ file.cpp \ dialogPlugin.cpp -OTHER_FILES += qmldir +EXAMPLE_FILES += qmldir # Copy the qmldir file to the same folder as the plugin binary cpqmldir.files = $$PWD/qmldir cpqmldir.path = $$DESTDIR COPIES += cpqmldir + +CONFIG += install_ok # Do not cargo-cult this! diff --git a/examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro b/examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro index 1fc74b69f3..725ff3bbac 100644 --- a/examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro +++ b/examples/quick/tutorials/gettingStartedQml/gettingStartedQml.pro @@ -7,4 +7,5 @@ EXAMPLE_FILES = \ images \ parts \ pics \ + texteditor.qmlproject \ texteditor.qml -- cgit v1.2.3 From fc3317caab0670df1774421b868376a0e218bd33 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Apr 2016 16:51:53 +0200 Subject: actually build the textureprovider example MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Idef70d65e6871fa995e680565424056c4caf4411 Reviewed-by: Topi Reiniö --- examples/quick/quick.pro | 1 + 1 file changed, 1 insertion(+) (limited to 'examples/quick') diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro index c5ef46173c..e60150c13b 100644 --- a/examples/quick/quick.pro +++ b/examples/quick/quick.pro @@ -15,6 +15,7 @@ SUBDIRS = quick-accessibility \ scenegraph \ shadereffects \ text \ + textureprovider \ threading \ touchinteraction \ tutorials \ -- cgit v1.2.3 From cb8ed3b918c994c20d22040f19b73b27456f1e31 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Apr 2016 16:59:53 +0200 Subject: actually build the 'graph' example MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I297e302b4672bcd05543b88d7da9318ae81a00b4 Reviewed-by: Topi Reiniö --- examples/quick/scenegraph/scenegraph.pro | 1 + 1 file changed, 1 insertion(+) (limited to 'examples/quick') diff --git a/examples/quick/scenegraph/scenegraph.pro b/examples/quick/scenegraph/scenegraph.pro index b9665e6015..cf50cdb903 100644 --- a/examples/quick/scenegraph/scenegraph.pro +++ b/examples/quick/scenegraph/scenegraph.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs SUBDIRS += \ customgeometry \ + graph \ openglunderqml \ sgengine \ simplematerial \ -- cgit v1.2.3