Make qmake happy with the examples structure and install targets

Change-Id: I5616e41e62a787693a7e1efb1be924c38b651cae
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>

18 files changed, 4 insertions, 1 deletions

diff --git a/examples/examples.pro b/examples/examples.pro
index 37eb94e..cfd3c75 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS += \
-    android/catalog
+    qmlandroid/catalog
diff --git a/examples/android/catalog/android/AndroidManifest.xml b/examples/qmlandroid/catalog/android/AndroidManifest.xml
index 11d18f7..11d18f7 100644
--- a/examples/android/catalog/android/AndroidManifest.xml
+++ b/examples/qmlandroid/catalog/android/AndroidManifest.xml
diff --git a/examples/android/catalog/android/assets/awesome.png b/examples/qmlandroid/catalog/android/assets/awesome.png
index 99a8c13..99a8c13 100644
--- a/examples/android/catalog/android/assets/awesome.png
+++ b/examples/qmlandroid/catalog/android/assets/awesome.png
diff --git a/examples/android/catalog/android/build.gradle b/examples/qmlandroid/catalog/android/build.gradle
index 80dcc74..80dcc74 100644
--- a/examples/android/catalog/android/build.gradle
+++ b/examples/qmlandroid/catalog/android/build.gradle
diff --git a/examples/android/catalog/android/gradle/wrapper/gradle-wrapper.properties b/examples/qmlandroid/catalog/android/gradle/wrapper/gradle-wrapper.properties
index 1e61d1f..1e61d1f 100644
--- a/examples/android/catalog/android/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/qmlandroid/catalog/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/examples/android/catalog/android/res/anim/awesome.xml b/examples/qmlandroid/catalog/android/res/anim/awesome.xml
index ee6d387..ee6d387 100644
--- a/examples/android/catalog/android/res/anim/awesome.xml
+++ b/examples/qmlandroid/catalog/android/res/anim/awesome.xml
diff --git a/examples/android/catalog/android/res/drawable/awesome.png b/examples/qmlandroid/catalog/android/res/drawable/awesome.png
index 99a8c13..99a8c13 100644
--- a/examples/android/catalog/android/res/drawable/awesome.png
+++ b/examples/qmlandroid/catalog/android/res/drawable/awesome.png
diff --git a/examples/android/catalog/android/res/drawable/logo.png b/examples/qmlandroid/catalog/android/res/drawable/logo.png
index f3d4a5e..f3d4a5e 100644
--- a/examples/android/catalog/android/res/drawable/logo.png
+++ b/examples/qmlandroid/catalog/android/res/drawable/logo.png
diff --git a/examples/android/catalog/catalog.pro b/examples/qmlandroid/catalog/catalog.pro
index 8e49352..4e133d3 100644
--- a/examples/android/catalog/catalog.pro
+++ b/examples/qmlandroid/catalog/catalog.pro
@@ -23,3 +23,6 @@ DISTFILES += \
 
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 QMLANDROID_PACKAGES = app support view widget
+
+target.path = $$[QT_INSTALL_EXAMPLES]/qmlandroid/catalog
+INSTALLS += target
diff --git a/examples/android/catalog/catalog.qrc b/examples/qmlandroid/catalog/catalog.qrc
index 9521232..9521232 100644
--- a/examples/android/catalog/catalog.qrc
+++ b/examples/qmlandroid/catalog/catalog.qrc
diff --git a/examples/android/catalog/main.cpp b/examples/qmlandroid/catalog/main.cpp
index 89e848f..89e848f 100644
--- a/examples/android/catalog/main.cpp
+++ b/examples/qmlandroid/catalog/main.cpp
diff --git a/examples/android/catalog/qml/AwesomeView.qml b/examples/qmlandroid/catalog/qml/AwesomeView.qml
index 3d1f707..3d1f707 100644
--- a/examples/android/catalog/qml/AwesomeView.qml
+++ b/examples/qmlandroid/catalog/qml/AwesomeView.qml
diff --git a/examples/android/catalog/qml/ButtonView.qml b/examples/qmlandroid/catalog/qml/ButtonView.qml
index ce09d1e..ce09d1e 100644
--- a/examples/android/catalog/qml/ButtonView.qml
+++ b/examples/qmlandroid/catalog/qml/ButtonView.qml
diff --git a/examples/android/catalog/qml/InputView.qml b/examples/qmlandroid/catalog/qml/InputView.qml
index aec0bbd..aec0bbd 100644
--- a/examples/android/catalog/qml/InputView.qml
+++ b/examples/qmlandroid/catalog/qml/InputView.qml
diff --git a/examples/android/catalog/qml/ModelView.qml b/examples/qmlandroid/catalog/qml/ModelView.qml
index ef42437..ef42437 100644
--- a/examples/android/catalog/qml/ModelView.qml
+++ b/examples/qmlandroid/catalog/qml/ModelView.qml
diff --git a/examples/android/catalog/qml/PickerView.qml b/examples/qmlandroid/catalog/qml/PickerView.qml
index a274cbf..a274cbf 100644
--- a/examples/android/catalog/qml/PickerView.qml
+++ b/examples/qmlandroid/catalog/qml/PickerView.qml
diff --git a/examples/android/catalog/qml/ProgressView.qml b/examples/qmlandroid/catalog/qml/ProgressView.qml
index b073ec5..b073ec5 100644
--- a/examples/android/catalog/qml/ProgressView.qml
+++ b/examples/qmlandroid/catalog/qml/ProgressView.qml
diff --git a/examples/android/catalog/qml/main.qml b/examples/qmlandroid/catalog/qml/main.qml
index 08c1156..08c1156 100644
--- a/examples/android/catalog/qml/main.qml
+++ b/examples/qmlandroid/catalog/qml/main.qml