Chat Tutorial: fix install targets

Change-Id: I6651ecffcc76953c06bc70e81b38c72aa1da9b02
Task-number: QTBUG-51918
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

11 files changed, 13 insertions, 82 deletions

diff --git a/examples/controls/chattutorial/chapter1-settingup/chapter1-settingup.pro b/examples/controls/chattutorial/chapter1-settingup/chapter1-settingup.pro
index 36ee0586..a1eebcac 100644
--- a/examples/controls/chattutorial/chapter1-settingup/chapter1-settingup.pro
+++ b/examples/controls/chattutorial/chapter1-settingup/chapter1-settingup.pro
@@ -7,4 +7,5 @@ SOURCES += main.cpp
 
 RESOURCES += qml.qrc
 
-include(deployment.pri)
+target.path = $$[QT_INSTALL_EXAMPLES]/qtlabscontrols/chattutorial/chapter1-settingup
+INSTALLS += target
diff --git a/examples/controls/chattutorial/chapter1-settingup/deployment.pri b/examples/controls/chattutorial/chapter1-settingup/deployment.pri
deleted file mode 100644
index c89af25a..00000000
--- a/examples/controls/chattutorial/chapter1-settingup/deployment.pri
+++ /dev/null
@@ -1,14 +0,0 @@
-unix:!android {
-    isEmpty(target.path) {
-        qnx {
-            target.path = /tmp/$${TARGET}/bin
-        } else {
-            target.path = /opt/$${TARGET}/bin
-        }
-        export(target.path)
-    }
-    INSTALLS += target
-}
-
-export(INSTALLS)
-
diff --git a/examples/controls/chattutorial/chapter2-lists/chapter2-lists.pro b/examples/controls/chattutorial/chapter2-lists/chapter2-lists.pro
index ed23d115..9d5187ff 100644
--- a/examples/controls/chattutorial/chapter2-lists/chapter2-lists.pro
+++ b/examples/controls/chattutorial/chapter2-lists/chapter2-lists.pro
@@ -8,5 +8,5 @@ SOURCES += main.cpp
 RESOURCES += qml.qrc \
     ../shared/shared.qrc
 
-include(deployment.pri)
-
+target.path = $$[QT_INSTALL_EXAMPLES]/qtlabscontrols/chattutorial/chapter2-lists
+INSTALLS += target
diff --git a/examples/controls/chattutorial/chapter2-lists/deployment.pri b/examples/controls/chattutorial/chapter2-lists/deployment.pri
deleted file mode 100644
index c89af25a..00000000
--- a/examples/controls/chattutorial/chapter2-lists/deployment.pri
+++ /dev/null
@@ -1,14 +0,0 @@
-unix:!android {
-    isEmpty(target.path) {
-        qnx {
-            target.path = /tmp/$${TARGET}/bin
-        } else {
-            target.path = /opt/$${TARGET}/bin
-        }
-        export(target.path)
-    }
-    INSTALLS += target
-}
-
-export(INSTALLS)
-
diff --git a/examples/controls/chattutorial/chapter3-navigation/chapter3-navigation.pro b/examples/controls/chattutorial/chapter3-navigation/chapter3-navigation.pro
index ed23d115..7a64f65d 100644
--- a/examples/controls/chattutorial/chapter3-navigation/chapter3-navigation.pro
+++ b/examples/controls/chattutorial/chapter3-navigation/chapter3-navigation.pro
@@ -8,5 +8,5 @@ SOURCES += main.cpp
 RESOURCES += qml.qrc \
     ../shared/shared.qrc
 
-include(deployment.pri)
-
+target.path = $$[QT_INSTALL_EXAMPLES]/qtlabscontrols/chattutorial/chapter3-navigation
+INSTALLS += target
diff --git a/examples/controls/chattutorial/chapter3-navigation/deployment.pri b/examples/controls/chattutorial/chapter3-navigation/deployment.pri
deleted file mode 100644
index c89af25a..00000000
--- a/examples/controls/chattutorial/chapter3-navigation/deployment.pri
+++ /dev/null
@@ -1,14 +0,0 @@
-unix:!android {
-    isEmpty(target.path) {
-        qnx {
-            target.path = /tmp/$${TARGET}/bin
-        } else {
-            target.path = /opt/$${TARGET}/bin
-        }
-        export(target.path)
-    }
-    INSTALLS += target
-}
-
-export(INSTALLS)
-
diff --git a/examples/controls/chattutorial/chapter4-models/chapter4-models.pro b/examples/controls/chattutorial/chapter4-models/chapter4-models.pro
index 4f35e954..e7709019 100644
--- a/examples/controls/chattutorial/chapter4-models/chapter4-models.pro
+++ b/examples/controls/chattutorial/chapter4-models/chapter4-models.pro
@@ -16,5 +16,5 @@ RESOURCES += \
     qml.qrc \
     ../shared/shared.qrc
 
-include(deployment.pri)
-
+target.path = $$[QT_INSTALL_EXAMPLES]/qtlabscontrols/chattutorial/chapter4-models
+INSTALLS += target
diff --git a/examples/controls/chattutorial/chapter4-models/deployment.pri b/examples/controls/chattutorial/chapter4-models/deployment.pri
deleted file mode 100644
index c89af25a..00000000
--- a/examples/controls/chattutorial/chapter4-models/deployment.pri
+++ /dev/null
@@ -1,14 +0,0 @@
-unix:!android {
-    isEmpty(target.path) {
-        qnx {
-            target.path = /tmp/$${TARGET}/bin
-        } else {
-            target.path = /opt/$${TARGET}/bin
-        }
-        export(target.path)
-    }
-    INSTALLS += target
-}
-
-export(INSTALLS)
-
diff --git a/examples/controls/chattutorial/chapter5-styling/chapter5-styling.pro b/examples/controls/chattutorial/chapter5-styling/chapter5-styling.pro
index 4f35e954..204442ba 100644
--- a/examples/controls/chattutorial/chapter5-styling/chapter5-styling.pro
+++ b/examples/controls/chattutorial/chapter5-styling/chapter5-styling.pro
@@ -16,5 +16,5 @@ RESOURCES += \
     qml.qrc \
     ../shared/shared.qrc
 
-include(deployment.pri)
-
+target.path = $$[QT_INSTALL_EXAMPLES]/qtlabscontrols/chattutorial/chapter5-styling
+INSTALLS += target
diff --git a/examples/controls/chattutorial/chapter5-styling/deployment.pri b/examples/controls/chattutorial/chapter5-styling/deployment.pri
deleted file mode 100644
index c89af25a..00000000
--- a/examples/controls/chattutorial/chapter5-styling/deployment.pri
+++ /dev/null
@@ -1,14 +0,0 @@
-unix:!android {
-    isEmpty(target.path) {
-        qnx {
-            target.path = /tmp/$${TARGET}/bin
-        } else {
-            target.path = /opt/$${TARGET}/bin
-        }
-        export(target.path)
-    }
-    INSTALLS += target
-}
-
-export(INSTALLS)
-
diff --git a/src/imports/controls/doc/src/qtlabscontrols-chattutorial.qdoc b/src/imports/controls/doc/src/qtlabscontrols-chattutorial.qdoc
index 009405c7..308f1715 100644
--- a/src/imports/controls/doc/src/qtlabscontrols-chattutorial.qdoc
+++ b/src/imports/controls/doc/src/qtlabscontrols-chattutorial.qdoc
@@ -180,10 +180,10 @@ The next line tells \c qmake that we have a collection of
 \l {The Qt Resource System}{resources} that should be built into the
 executable.
 
-\printline include
+\printline target.path
 
-This line includes a generated \c .pri file that handles deployment of our
-application to certain devices.
+This line determines where the example will be copied to when running
+\c {make install}.
 
 Now we can build and run the application: