Fix the qmltypes generation regression

Without generating them in the source directory, we have a hard time
detecting changes, so that we can then commit those. This is how
5.15 used to work, but this got broken when the whole mechanism was
reimplemented in cmake.

Change-Id: I5c39cdeead655fdd324b07d66223100b4d372479
Reviewed-by: Dominik Holland <dominik.holland@qt.io>

3 files changed, 15 insertions, 5 deletions

diff --git a/qmltypes/QtApplicationManager/SystemUI/plugins.qmltypes b/qmltypes/QtApplicationManager/SystemUI/plugins.qmltypes
index 89bc3d52..4f642255 100644
--- a/qmltypes/QtApplicationManager/SystemUI/plugins.qmltypes
+++ b/qmltypes/QtApplicationManager/SystemUI/plugins.qmltypes
@@ -230,13 +230,16 @@ Module {
         Signal {
             name: "objectFollowsItemSizeChanged"
         }
+        Signal {
+            name: "contentItemDataChanged"
+        }
         Method {
             name: "makePrimary"
         }
     }
     Component {
         name: "Window"
-        exports: [ "QtApplicationManager.SystemUI/Window 2.0" ]
+        exports: [ "QtApplicationManager.SystemUI/WindowObject 2.0" ]
         exportMetaObjectRevisions: [ 0 ]
         prototype: "QObject"
         isCreatable: false
@@ -432,6 +435,10 @@ Module {
             name: "applicationChanged"
             Parameter { name: "newApplication"; type: "Application"; isPointer: true; }
         }
+        Signal {
+            name: "controlGroupChanged"
+            Parameter { name: "controlGroup"; type: "string"; }
+        }
     }
     Component {
         name: "AbstractRuntime"
@@ -451,7 +458,7 @@ Module {
         }
         Signal {
             name: "inProcessSurfaceItemReady"
-            Parameter { name: "window"; type: "QSharedPointer<InProcessSurfaceItem>"; }
+            Parameter { name: "window"; type: "InProcessSurfaceItem>"; }
         }
     }
     Component {
diff --git a/qmltypes/QtApplicationManager/plugins.qmltypes b/qmltypes/QtApplicationManager/plugins.qmltypes
index 924d8c27..28ad1058 100644
--- a/qmltypes/QtApplicationManager/plugins.qmltypes
+++ b/qmltypes/QtApplicationManager/plugins.qmltypes
@@ -30,6 +30,9 @@ Module {
         Signal {
             name: "maximumCountChanged"
         }
+        Signal {
+            name: "dataSourcesChanged"
+        }
         Method {
             name: "clear"
         }
diff --git a/src/tools/dumpqmltypes/CMakeLists.txt b/src/tools/dumpqmltypes/CMakeLists.txt
index 2dd452b5..f7997553 100644
--- a/src/tools/dumpqmltypes/CMakeLists.txt
+++ b/src/tools/dumpqmltypes/CMakeLists.txt
@@ -25,11 +25,11 @@ if(TARGET ${target_name} AND NOT QT_FEATURE_cross_compile)
 
     if(QT_WILL_INSTALL)
         qt_install(
-            DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/qmltypes/QtApplicationManager"
+            DIRECTORY "${CMAKE_SOURCE_DIR}/qmltypes/QtApplicationManager"
             DESTINATION "${qml_install_dir}"
         )
     else()
-        set(COPY_COMMAND COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_BINARY_DIR}/qmltypes" "${qml_install_dir}")
+        set(COPY_COMMAND COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/qmltypes" "${qml_install_dir}")
     endif()
 
     qt_internal_collect_command_environment(env_path env_plugin_path)
@@ -49,7 +49,7 @@ if(TARGET ${target_name} AND NOT QT_FEATURE_cross_compile)
         POST_BUILD
         BYPRODUCTS "qmltypes"
         COMMAND "${CMAKE_COMMAND}" -E env "PATH=${env_path}${QT_PATH_SEPARATOR}$ENV{PATH}"
-                "${tool_path}" "${CMAKE_CURRENT_BINARY_DIR}/qmltypes"
+                "${tool_path}" "${CMAKE_SOURCE_DIR}/qmltypes"
         ${COPY_COMMAND}
         DEPENDS "${tool_path}"
         COMMENT "Generating qmltypes using ${tool_path}"