Merge remote-tracking branch 'origin/5.6.1' into 5.6

Change-Id: Ib7f8c60143c1efab279476dba390a3d9837ccc37

19 files changed, 47 insertions, 7 deletions

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/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!
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
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/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 \
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 dd77d76e4f..1a880b61f1 100644
--- a/examples/quick/scenegraph/graph/graph.pro
+++ b/examples/quick/scenegraph/graph/graph.pro
@@ -26,3 +26,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..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 \
@@ -8,3 +9,6 @@ SUBDIRS += \
         textureinthread \
         threadedanimation \
         twotextureproviders
+
+EXAMPLE_FILES += \
+    shared
diff --git a/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro
index e88e8f670c..8f8f4549aa 100644
--- a/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro
+++ b/examples/quick/tutorials/gettingStartedQml/filedialog/filedialog.pro
@@ -18,8 +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
-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
+
+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
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