diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 13:04:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 20:41:34 +0200 |
| commit | 63ec33e79cf86c4312c58bea12a2aab400890c70 (patch) | |
| tree | 5c9b5cd51276ea0a3ca42567666a09e70efa11cc /examples/qml/tutorials | |
| parent | b9e4a4df577959579b2322fb6077bde82d9ffce3 (diff) | |
| parent | afc84775efdc6e13e2e210bb94e115b378d90134 (diff) | |
| download | qtdeclarative-63ec33e79cf86c4312c58bea12a2aab400890c70.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4engine_p.h
Change-Id: I89ffccd699bee675732758d039e22224b275d60d
Diffstat (limited to 'examples/qml/tutorials')
| -rw-r--r-- | examples/qml/tutorials/extending-qml/chapter3-bindings/chapter3-bindings.pro | 4 | ||||
| -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.pro | 3 | ||||
| -rw-r--r-- | examples/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro | 6 | ||||
| -rw-r--r-- | examples/qml/tutorials/tutorials.pro | 3 |
5 files changed, 13 insertions, 3 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 cefcf3b477..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,7 +20,11 @@ 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 -QMAKE_POST_LINK += $$QMAKE_COPY $$replace($$list($$quote($$PWD/qmldir) $$DESTDIR), /, $$QMAKE_DIR_SEP) +cpqmldir.files = qmldir +cpqmldir.path = $$DESTDIR +COPIES += cpqmldir 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 |