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 --- .../qml/tutorials/extending-qml/chapter6-plugins/import/import.pro | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'examples/qml') diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro index cefcf3b477..43bf976f09 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro @@ -23,4 +23,6 @@ INSTALLS += target qmldir OTHER_FILES += qmldir # Copy the qmldir file to the same folder as the plugin binary -QMAKE_POST_LINK += $$QMAKE_COPY $$replace($$list($$quote($$PWD/qmldir) $$DESTDIR), /, $$QMAKE_DIR_SEP) +cpqmldir.files = 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/qml/qmlextensionplugins/qmlextensionplugins.pro | 2 ++ 1 file changed, 2 insertions(+) (limited to 'examples/qml') diff --git a/examples/qml/qmlextensionplugins/qmlextensionplugins.pro b/examples/qml/qmlextensionplugins/qmlextensionplugins.pro index 64fd23af8d..946626cce7 100644 --- a/examples/qml/qmlextensionplugins/qmlextensionplugins.pro +++ b/examples/qml/qmlextensionplugins/qmlextensionplugins.pro @@ -21,3 +21,5 @@ target.path += $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins/imports/TimeExamp pluginfiles.path += $$[QT_INSTALL_EXAMPLES]/qml/qmlextensionplugins/imports/TimeExample INSTALLS += target qml pluginfiles + +CONFIG += install_ok # Do not cargo-cult this! -- 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/qml/qml.pro | 1 + .../tutorials/extending-qml/chapter3-bindings/chapter3-binding.qrc | 5 ----- .../tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro | 4 ++-- .../tutorials/extending-qml/chapter3-bindings/chapter3-bindings.qrc | 5 +++++ examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro | 3 +++ .../qml/tutorials/extending-qml/chapter6-plugins/import/import.pro | 2 ++ examples/qml/tutorials/tutorials.pro | 3 +++ 7 files changed, 16 insertions(+), 7 deletions(-) delete mode 100644 examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-binding.qrc create mode 100644 examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.qrc create mode 100644 examples/qml/tutorials/tutorials.pro (limited to 'examples/qml') diff --git a/examples/qml/qml.pro b/examples/qml/qml.pro index d5f9fa8a9e..eb4c98e5c4 100644 --- a/examples/qml/qml.pro +++ b/examples/qml/qml.pro @@ -7,6 +7,7 @@ qtHaveModule(quick): SUBDIRS += \ SUBDIRS += \ referenceexamples \ + tutorials \ shell EXAMPLE_FILES = \ diff --git a/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-binding.qrc b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-binding.qrc deleted file mode 100644 index f1168aef3b..0000000000 --- a/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-binding.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - app.qml - - diff --git a/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro index 0c31592eeb..1ae83f71eb 100644 --- a/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro +++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro @@ -4,9 +4,9 @@ HEADERS += piechart.h SOURCES += piechart.cpp \ main.cpp -RESOURCES += chapter3-binding.qrc +RESOURCES += chapter3-bindings.qrc -DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter3-binding +DESTPATH = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter3-bindings target.path = $$DESTPATH qml.files = *.qml diff --git a/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.qrc b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.qrc new file mode 100644 index 0000000000..f1168aef3b --- /dev/null +++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.qrc @@ -0,0 +1,5 @@ + + + app.qml + + diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro b/examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro index 4d0e807417..b340981e42 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro @@ -13,3 +13,6 @@ osx { SOURCES += main.cpp RESOURCES += app.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/qml/tutorials/extending-qml/chapter6-plugins +INSTALLS += target diff --git a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro index 43bf976f09..5cf4621420 100644 --- a/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro +++ b/examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro @@ -20,6 +20,8 @@ qmldir.files=$$PWD/qmldir qmldir.path=$$DESTPATH INSTALLS += target qmldir +CONFIG += install_ok # Do not cargo-cult this! + OTHER_FILES += qmldir # Copy the qmldir file to the same folder as the plugin binary diff --git a/examples/qml/tutorials/tutorials.pro b/examples/qml/tutorials/tutorials.pro new file mode 100644 index 0000000000..265b3b69cc --- /dev/null +++ b/examples/qml/tutorials/tutorials.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs +qtHaveModule(quick): SUBDIRS += \ + extending-qml -- cgit v1.2.3