Fix installation of the examples

- Only the project files and wrapper scripts were being installed
- They were being put directly into Qt's example dir. They should be grouped
  into a applicationmanager subdirectory there, similarly to what other
  modules do.

Task-number: AUTOSUITE-591
Change-Id: I1da6b28a8fe2e9210ad109309d30dfc1ad0d1e99
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>

50 files changed, 53 insertions, 27 deletions

diff --git a/examples/applicationmanager/applicationmanager.pro b/examples/applicationmanager/applicationmanager.pro
new file mode 100644
index 00000000..bf10ac2c
--- /dev/null
+++ b/examples/applicationmanager/applicationmanager.pro
@@ -0,0 +1,14 @@
+TEMPLATE = subdirs
+
+SUBDIRS = \
+    minidesk \
+    monitor \
+    multi-views \
+    startup-plugin \
+
+# remove the !headless and handle this in the example when we switch to the new configure system
+!headless:SUBDIRS += \
+    custom-appman \
+
+linux:!android:SUBDIRS += \
+    softwarecontainer-plugin \
diff --git a/examples/custom-appman/custom-appman.cpp b/examples/applicationmanager/custom-appman/custom-appman.cpp
index decccd08..decccd08 100644
--- a/examples/custom-appman/custom-appman.cpp
+++ b/examples/applicationmanager/custom-appman/custom-appman.cpp
diff --git a/examples/custom-appman/custom-appman.pro b/examples/applicationmanager/custom-appman/custom-appman.pro
index 3dca398d..e1ebab9e 100644
--- a/examples/custom-appman/custom-appman.pro
+++ b/examples/applicationmanager/custom-appman/custom-appman.pro
@@ -14,5 +14,9 @@ OTHER_FILES += \
     doc/src/*.qdoc \
     doc/images/*.png \
 
-target.path = $$[QT_INSTALL_EXAMPLES]/custom-appman
+target.path = $$[QT_INSTALL_EXAMPLES]/applicationmanager/custom-appman
 INSTALLS += target
+
+example_sources.path = $$target.path
+example_sources.files = $SOURCES doc
+INSTALLS += example_sources
diff --git a/examples/custom-appman/doc/images/custom-appman.png b/examples/applicationmanager/custom-appman/doc/images/custom-appman.png
index 64bae006..64bae006 100644
--- a/examples/custom-appman/doc/images/custom-appman.png
+++ b/examples/applicationmanager/custom-appman/doc/images/custom-appman.png
diff --git a/examples/custom-appman/doc/src/custom-appman.qdoc b/examples/applicationmanager/custom-appman/doc/src/custom-appman.qdoc
index 5ea6d44f..5ea6d44f 100644
--- a/examples/custom-appman/doc/src/custom-appman.qdoc
+++ b/examples/applicationmanager/custom-appman/doc/src/custom-appman.qdoc
diff --git a/examples/minidesk/am-config.yaml b/examples/applicationmanager/minidesk/am-config.yaml
index 269e20c7..269e20c7 100644
--- a/examples/minidesk/am-config.yaml
+++ b/examples/applicationmanager/minidesk/am-config.yaml
diff --git a/examples/minidesk/apps/tld.minidesk.app1/app1.qml b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml
index 76ab5dc0..76ab5dc0 100644
--- a/examples/minidesk/apps/tld.minidesk.app1/app1.qml
+++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/app1.qml
diff --git a/examples/minidesk/apps/tld.minidesk.app1/icon.png b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/icon.png
index adb840ce..adb840ce 100644
--- a/examples/minidesk/apps/tld.minidesk.app1/icon.png
+++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/icon.png
diff --git a/examples/minidesk/apps/tld.minidesk.app1/info.yaml b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/info.yaml
index 953e852f..953e852f 100644
--- a/examples/minidesk/apps/tld.minidesk.app1/info.yaml
+++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app1/info.yaml
diff --git a/examples/minidesk/apps/tld.minidesk.app2/app2.qml b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml
index 88b1f745..88b1f745 100644
--- a/examples/minidesk/apps/tld.minidesk.app2/app2.qml
+++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/app2.qml
diff --git a/examples/minidesk/apps/tld.minidesk.app2/icon.png b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/icon.png
index 3f8caa42..3f8caa42 100644
--- a/examples/minidesk/apps/tld.minidesk.app2/icon.png
+++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/icon.png
diff --git a/examples/minidesk/apps/tld.minidesk.app2/info.yaml b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/info.yaml
index 65759aa8..65759aa8 100644
--- a/examples/minidesk/apps/tld.minidesk.app2/info.yaml
+++ b/examples/applicationmanager/minidesk/apps/tld.minidesk.app2/info.yaml
diff --git a/examples/minidesk/doc/images/minidesk.png b/examples/applicationmanager/minidesk/doc/images/minidesk.png
index 0a16982a..0a16982a 100644
--- a/examples/minidesk/doc/images/minidesk.png
+++ b/examples/applicationmanager/minidesk/doc/images/minidesk.png
diff --git a/examples/minidesk/doc/src/minidesk.qdoc b/examples/applicationmanager/minidesk/doc/src/minidesk.qdoc
index ad85c36e..ad85c36e 100644
--- a/examples/minidesk/doc/src/minidesk.qdoc
+++ b/examples/applicationmanager/minidesk/doc/src/minidesk.qdoc
diff --git a/examples/minidesk/minidesk.pro b/examples/applicationmanager/minidesk/minidesk.pro
index 42561522..d12a6917 100644
--- a/examples/minidesk/minidesk.pro
+++ b/examples/applicationmanager/minidesk/minidesk.pro
@@ -14,10 +14,14 @@ OTHER_FILES += \
     apps/tld.minidesk.app2/*.qml \
     apps/tld.minidesk.app2/*.png \
 
-target.path = $$[QT_INSTALL_EXAMPLES]/minidesk
+target.path = $$[QT_INSTALL_EXAMPLES]/applicationmanager/minidesk
 INSTALLS += target
 
 AM_COPY_DIRECTORIES += apps system-ui
 AM_COPY_FILES += am-config.yaml
 
 AM_DEFAULT_ARGS=-c am-config.yaml --start-session-dbus --verbose
+
+example_sources.path = $$target.path
+example_sources.files = $$AM_COPY_FILES $$AM_COPY_DIRECTORIES doc
+INSTALLS += example_sources
diff --git a/examples/minidesk/minidesk.qmlproject b/examples/applicationmanager/minidesk/minidesk.qmlproject
index 5ce6345e..5ce6345e 100644
--- a/examples/minidesk/minidesk.qmlproject
+++ b/examples/applicationmanager/minidesk/minidesk.qmlproject
diff --git a/examples/minidesk/system-ui/Readme.qml b/examples/applicationmanager/minidesk/system-ui/Readme.qml
index 01144436..01144436 100644
--- a/examples/minidesk/system-ui/Readme.qml
+++ b/examples/applicationmanager/minidesk/system-ui/Readme.qml
diff --git a/examples/minidesk/system-ui/main.qml b/examples/applicationmanager/minidesk/system-ui/main.qml
index 1ba08ddc..1ba08ddc 100644
--- a/examples/minidesk/system-ui/main.qml
+++ b/examples/applicationmanager/minidesk/system-ui/main.qml
diff --git a/examples/monitor/am-config.yaml b/examples/applicationmanager/monitor/am-config.yaml
index 5212d8fb..5212d8fb 100644
--- a/examples/monitor/am-config.yaml
+++ b/examples/applicationmanager/monitor/am-config.yaml
diff --git a/examples/monitor/apps/tld.monitor.app/ApplicationWindow.qml b/examples/applicationmanager/monitor/apps/tld.monitor.app/ApplicationWindow.qml
index d326205a..d326205a 100644
--- a/examples/monitor/apps/tld.monitor.app/ApplicationWindow.qml
+++ b/examples/applicationmanager/monitor/apps/tld.monitor.app/ApplicationWindow.qml
diff --git a/examples/monitor/apps/tld.monitor.app/app.qml b/examples/applicationmanager/monitor/apps/tld.monitor.app/app.qml
index e8c57e0a..e8c57e0a 100644
--- a/examples/monitor/apps/tld.monitor.app/app.qml
+++ b/examples/applicationmanager/monitor/apps/tld.monitor.app/app.qml
diff --git a/examples/monitor/apps/tld.monitor.app/dummyicon b/examples/applicationmanager/monitor/apps/tld.monitor.app/dummyicon
index e69de29b..e69de29b 100644
--- a/examples/monitor/apps/tld.monitor.app/dummyicon
+++ b/examples/applicationmanager/monitor/apps/tld.monitor.app/dummyicon
diff --git a/examples/monitor/apps/tld.monitor.app/info.yaml b/examples/applicationmanager/monitor/apps/tld.monitor.app/info.yaml
index cd0a58c8..cd0a58c8 100644
--- a/examples/monitor/apps/tld.monitor.app/info.yaml
+++ b/examples/applicationmanager/monitor/apps/tld.monitor.app/info.yaml
diff --git a/examples/monitor/doc/images/monitor.png b/examples/applicationmanager/monitor/doc/images/monitor.png
index d3b3cddd..d3b3cddd 100644
--- a/examples/monitor/doc/images/monitor.png
+++ b/examples/applicationmanager/monitor/doc/images/monitor.png
diff --git a/examples/monitor/doc/src/monitor.qdoc b/examples/applicationmanager/monitor/doc/src/monitor.qdoc
index 603f6b36..603f6b36 100644
--- a/examples/monitor/doc/src/monitor.qdoc
+++ b/examples/applicationmanager/monitor/doc/src/monitor.qdoc
diff --git a/examples/monitor/monitor.pro b/examples/applicationmanager/monitor/monitor.pro
index 05106336..8a93c3bd 100644
--- a/examples/monitor/monitor.pro
+++ b/examples/applicationmanager/monitor/monitor.pro
@@ -10,10 +10,14 @@ OTHER_FILES += \
     apps/tld.monitor.app/*.yaml \
     apps/tld.monitor.app/*.qml
 
-target.path = $$[QT_INSTALL_EXAMPLES]/monitor
+target.path = $$[QT_INSTALL_EXAMPLES]/applicationmanager/monitor
 INSTALLS += target
 
 AM_COPY_DIRECTORIES += apps system-ui
 AM_COPY_FILES += am-config.yaml
 
 AM_DEFAULT_ARGS=-c am-config.yaml --start-session-dbus --verbose
+
+example_sources.path = $$target.path
+example_sources.files = $$AM_COPY_FILES $$AM_COPY_DIRECTORIES doc
+INSTALLS += example_sources
diff --git a/examples/monitor/monitor.qmlproject b/examples/applicationmanager/monitor/monitor.qmlproject
index 5ce6345e..5ce6345e 100644
--- a/examples/monitor/monitor.qmlproject
+++ b/examples/applicationmanager/monitor/monitor.qmlproject
diff --git a/examples/monitor/system-ui/MonitorChart.qml b/examples/applicationmanager/monitor/system-ui/MonitorChart.qml
index 0d49e346..0d49e346 100644
--- a/examples/monitor/system-ui/MonitorChart.qml
+++ b/examples/applicationmanager/monitor/system-ui/MonitorChart.qml
diff --git a/examples/monitor/system-ui/MonitorText.qml b/examples/applicationmanager/monitor/system-ui/MonitorText.qml
index 263a22ec..263a22ec 100644
--- a/examples/monitor/system-ui/MonitorText.qml
+++ b/examples/applicationmanager/monitor/system-ui/MonitorText.qml
diff --git a/examples/monitor/system-ui/Switch.qml b/examples/applicationmanager/monitor/system-ui/Switch.qml
index 6ed638fb..6ed638fb 100644
--- a/examples/monitor/system-ui/Switch.qml
+++ b/examples/applicationmanager/monitor/system-ui/Switch.qml
diff --git a/examples/monitor/system-ui/Tile.qml b/examples/applicationmanager/monitor/system-ui/Tile.qml
index d3a06b18..d3a06b18 100644
--- a/examples/monitor/system-ui/Tile.qml
+++ b/examples/applicationmanager/monitor/system-ui/Tile.qml
diff --git a/examples/monitor/system-ui/WindowContainer.qml b/examples/applicationmanager/monitor/system-ui/WindowContainer.qml
index 3b292cda..3b292cda 100644
--- a/examples/monitor/system-ui/WindowContainer.qml
+++ b/examples/applicationmanager/monitor/system-ui/WindowContainer.qml
diff --git a/examples/monitor/system-ui/main.qml b/examples/applicationmanager/monitor/system-ui/main.qml
index 5343a55d..5343a55d 100644
--- a/examples/monitor/system-ui/main.qml
+++ b/examples/applicationmanager/monitor/system-ui/main.qml
diff --git a/examples/multi-views/am-config.yaml b/examples/applicationmanager/multi-views/am-config.yaml
index 1fa63b8a..1fa63b8a 100644
--- a/examples/multi-views/am-config.yaml
+++ b/examples/applicationmanager/multi-views/am-config.yaml
diff --git a/examples/multi-views/apps/tld.multi-views.app/app1.qml b/examples/applicationmanager/multi-views/apps/tld.multi-views.app/app1.qml
index dff73e7a..dff73e7a 100644
--- a/examples/multi-views/apps/tld.multi-views.app/app1.qml
+++ b/examples/applicationmanager/multi-views/apps/tld.multi-views.app/app1.qml
diff --git a/examples/multi-views/apps/tld.multi-views.app/icon.png b/examples/applicationmanager/multi-views/apps/tld.multi-views.app/icon.png
index adb840ce..adb840ce 100644
--- a/examples/multi-views/apps/tld.multi-views.app/icon.png
+++ b/examples/applicationmanager/multi-views/apps/tld.multi-views.app/icon.png
diff --git a/examples/multi-views/apps/tld.multi-views.app/info.yaml b/examples/applicationmanager/multi-views/apps/tld.multi-views.app/info.yaml
index 36ace0e1..36ace0e1 100644
--- a/examples/multi-views/apps/tld.multi-views.app/info.yaml
+++ b/examples/applicationmanager/multi-views/apps/tld.multi-views.app/info.yaml
diff --git a/examples/applicationmanager/multi-views/multi-views.pro b/examples/applicationmanager/multi-views/multi-views.pro
new file mode 100644
index 00000000..82c6fece
--- /dev/null
+++ b/examples/applicationmanager/multi-views/multi-views.pro
@@ -0,0 +1,21 @@
+TEMPLATE = app
+CONFIG += am-systemui
+
+OTHER_FILES += \
+    am-config.yaml \
+    system-ui/*.qml \
+    apps/tld.multi-views.app/*.yaml \
+    apps/tld.multi-views.app/*.qml \
+    apps/tld.multi-views.app/*.png \
+
+target.path = $$[QT_INSTALL_EXAMPLES]/applicationmanager/multi-views
+INSTALLS += target
+
+AM_COPY_DIRECTORIES += apps system-ui
+AM_COPY_FILES += am-config.yaml
+
+AM_DEFAULT_ARGS=-c am-config.yaml --start-session-dbus --verbose -r
+
+example_sources.path = $$target.path
+example_sources.files = $$AM_COPY_FILES $$AM_COPY_DIRECTORIES
+INSTALLS += example_sources
diff --git a/examples/multi-views/system-ui/Readme.qml b/examples/applicationmanager/multi-views/system-ui/Readme.qml
index 000e5fdf..000e5fdf 100644
--- a/examples/multi-views/system-ui/Readme.qml
+++ b/examples/applicationmanager/multi-views/system-ui/Readme.qml
diff --git a/examples/multi-views/system-ui/main.qml b/examples/applicationmanager/multi-views/system-ui/main.qml
index 64d5ce4f..64d5ce4f 100644
--- a/examples/multi-views/system-ui/main.qml
+++ b/examples/applicationmanager/multi-views/system-ui/main.qml
diff --git a/examples/softwarecontainer-plugin/README.md b/examples/applicationmanager/softwarecontainer-plugin/README.md
index 57d7eb3b..57d7eb3b 100644
--- a/examples/softwarecontainer-plugin/README.md
+++ b/examples/applicationmanager/softwarecontainer-plugin/README.md
diff --git a/examples/softwarecontainer-plugin/service-manifest.d/io.qt.ApplicationManager.Application.json b/examples/applicationmanager/softwarecontainer-plugin/service-manifest.d/io.qt.ApplicationManager.Application.json
index 68592c08..68592c08 100644
--- a/examples/softwarecontainer-plugin/service-manifest.d/io.qt.ApplicationManager.Application.json
+++ b/examples/applicationmanager/softwarecontainer-plugin/service-manifest.d/io.qt.ApplicationManager.Application.json
diff --git a/examples/softwarecontainer-plugin/softwarecontainer-plugin.pro b/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer-plugin.pro
index 01e17555..2e8febc8 100644
--- a/examples/softwarecontainer-plugin/softwarecontainer-plugin.pro
+++ b/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer-plugin.pro
@@ -12,7 +12,7 @@ HEADERS += \
 SOURCES += \
     softwarecontainer.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/softwarecontainer-plugin
+target.path = $$[QT_INSTALL_EXAMPLES]/applicationmanager/softwarecontainer-plugin
 INSTALLS += target
 
 DISTFILES += \
diff --git a/examples/softwarecontainer-plugin/softwarecontainer.cpp b/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.cpp
index 7e34bd86..7e34bd86 100644
--- a/examples/softwarecontainer-plugin/softwarecontainer.cpp
+++ b/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.cpp
diff --git a/examples/softwarecontainer-plugin/softwarecontainer.h b/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.h
index 50d47312..50d47312 100644
--- a/examples/softwarecontainer-plugin/softwarecontainer.h
+++ b/examples/applicationmanager/softwarecontainer-plugin/softwarecontainer.h
diff --git a/examples/startup-plugin/startup-plugin.cpp b/examples/applicationmanager/startup-plugin/startup-plugin.cpp
index 15bdd175..15bdd175 100644
--- a/examples/startup-plugin/startup-plugin.cpp
+++ b/examples/applicationmanager/startup-plugin/startup-plugin.cpp
diff --git a/examples/startup-plugin/startup-plugin.h b/examples/applicationmanager/startup-plugin/startup-plugin.h
index c1fe0b05..c1fe0b05 100644
--- a/examples/startup-plugin/startup-plugin.h
+++ b/examples/applicationmanager/startup-plugin/startup-plugin.h
diff --git a/examples/startup-plugin/startup-plugin.pro b/examples/applicationmanager/startup-plugin/startup-plugin.pro
index 833c5c74..3cfdd7e3 100644
--- a/examples/startup-plugin/startup-plugin.pro
+++ b/examples/applicationmanager/startup-plugin/startup-plugin.pro
@@ -1,4 +1,3 @@
-
 TEMPLATE = lib
 CONFIG += plugin c++11
 TARGET = startup-plugin
@@ -11,5 +10,5 @@ HEADERS += \
 SOURCES += \
     startup-plugin.cpp
 
-target.path = $$[QT_INSTALL_EXAMPLES]/startup-plugin
+target.path = $$[QT_INSTALL_EXAMPLES]/applicationmanager/startup-plugin
 INSTALLS += target
diff --git a/examples/examples.pro b/examples/examples.pro
index bf10ac2c..0c71cbbb 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,14 +1,4 @@
 TEMPLATE = subdirs
 
 SUBDIRS = \
-    minidesk \
-    monitor \
-    multi-views \
-    startup-plugin \
-
-# remove the !headless and handle this in the example when we switch to the new configure system
-!headless:SUBDIRS += \
-    custom-appman \
-
-linux:!android:SUBDIRS += \
-    softwarecontainer-plugin \
+    applicationmanager \
diff --git a/examples/multi-views/multi-views.pro b/examples/multi-views/multi-views.pro
deleted file mode 100644
index 60bbb892..00000000
--- a/examples/multi-views/multi-views.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = aux
-
-OTHER_FILES += \
-    am-config.yaml \
-    doc/src/*.qdoc \
-    doc/images/*.png \
-    system-ui/*.qml \
-    apps/tld.multi-views.app/*.yaml \
-    apps/tld.multi-views.app/*.qml \
-    apps/tld.multi-views.app/*.png \