summaryrefslogtreecommitdiffstats
path: root/examples/qml/tutorials
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-04-21 16:49:12 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2016-05-13 04:35:27 +0000
commitee874f7e0ac4a85d0e765ff5d134f8afd44bb8ae (patch)
treef4fc50348f92e039a6c083ec0ce7b1b3e101dc7c /examples/qml/tutorials
parente6581ed818b72e06afddce555be20bd10979ce5e (diff)
actually build and install the qml tutorials
Change-Id: Idf81981140e210b29239e91ff5b6b7c40e2f36de Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'examples/qml/tutorials')
-rw-r--r--examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro4
-rw-r--r--examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.qrc (renamed from examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-binding.qrc)0
-rw-r--r--examples/qml/tutorials/extending-qml/chapter6-plugins/app.pro3
-rw-r--r--examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro2
-rw-r--r--examples/qml/tutorials/tutorials.pro3
5 files changed, 10 insertions, 2 deletions
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-binding.qrc b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.qrc
index f1168aef3b..f1168aef3b 100644
--- a/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-binding.qrc
+++ b/examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.qrc
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