cmake: Re-enable the qmake build system for the examples

For this to work, we need to adjust the dependencies.
Also fix the copy/install for the qmake features, which were copied to the
wrong directory.

Change-Id: Ia7168b2efbf5e558c849d7933abd105b496324e4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Robert Griebl <robert.griebl@qt.io>

8 files changed, 25 insertions, 23 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 018d1228..f00cf678 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,8 +128,12 @@ if(NOT QT_BUILD_STANDALONE_TESTS)
     set(mkspecs_install_dir "${INSTALL_MKSPECSDIR}")
     qt_path_join(mkspecs_install_dir ${QT_INSTALL_DIR} ${mkspecs_install_dir})
 
-    qt_copy_or_install(DIRECTORY qmake-features/
-        DESTINATION "${mkspecs_install_dir}"
-        FILES_MATCHING PATTERN "*.pr[if]"
+    file(GLOB QMAKE_FEATURES
+        "qmake-features/*.prf"
+    )
+
+    qt_copy_or_install(
+        FILES "${QMAKE_FEATURES}"
+        DESTINATION "${mkspecs_install_dir}/features"
     )
 endif()
diff --git a/dependencies.yaml b/dependencies.yaml
index 77183be6..26660c59 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,10 +1,10 @@
 dependencies:
   ../qtbase:
-    ref: e473d96e65e7cf3190c6c16acace6359964d0bee
+    ref: 640c5ca088319d9a372072c180eef35c80a552e8
     required: true
   ../qtdeclarative:
-    ref: 22169421d462e01dbda9aff54e71dd1ed62ee90f
+    ref: 393f1ca8b85117db81baab2d907fa7a980e3413a
     required: true
   ../qtwayland:
-    ref: f8ee89885ee5142cd4595f7243575e763b589561
+    ref: 1c9ef49c803d38613d851989b761ea9bbaf54b94
     required: false
diff --git a/examples/applicationmanager/application-features/native/widgets/main.cpp b/examples/applicationmanager/application-features/native/widgets/main.cpp
index 6cd73b8b..39872e55 100644
--- a/examples/applicationmanager/application-features/native/widgets/main.cpp
+++ b/examples/applicationmanager/application-features/native/widgets/main.cpp
@@ -54,10 +54,10 @@
 #include <QDialog>
 #include <QVBoxLayout>
 
-#include "launchermain.h"
-#include "logging.h"
-#include "dbusapplicationinterface.h"
-#include "dbusnotification.h"
+#include <QtAppManCommon/logging.h>
+#include <QtAppManLauncher/launchermain.h>
+#include <QtAppManLauncher/dbusapplicationinterface.h>
+#include <QtAppManLauncher/dbusnotification.h>
 
 
 int main(int argc, char *argv[])
diff --git a/examples/applicationmanager/applicationmanager.pro b/examples/applicationmanager/applicationmanager.pro
index 651be23e..82074d71 100644
--- a/examples/applicationmanager/applicationmanager.pro
+++ b/examples/applicationmanager/applicationmanager.pro
@@ -1,7 +1,3 @@
-# temporarily disabled because the module.pri files generated from the cmake
-# are wrong: e.g. appman_main-private depends on appman_common, while it should
-# depend on appman_common-private
-requires(false)
 
 TEMPLATE = subdirs
 
diff --git a/examples/applicationmanager/startup-plugin/startup-plugin.h b/examples/applicationmanager/startup-plugin/startup-plugin.h
index f1c6e5fc..184bf4e1 100644
--- a/examples/applicationmanager/startup-plugin/startup-plugin.h
+++ b/examples/applicationmanager/startup-plugin/startup-plugin.h
@@ -51,7 +51,7 @@
 ****************************************************************************/
 
 #include <QLoggingCategory>
-#include <QtAppManPluginInterfaces>
+#include <QtAppManPluginInterfaces/startupinterface.h>
 #include <QtAppManCommon/global.h>
 
 Q_DECLARE_LOGGING_CATEGORY(LogMe)
diff --git a/src/3rdparty/libarchive/CMakeLists.txt b/src/3rdparty/libarchive/CMakeLists.txt
index f7080a4f..fbb44bf9 100644
--- a/src/3rdparty/libarchive/CMakeLists.txt
+++ b/src/3rdparty/libarchive/CMakeLists.txt
@@ -1,6 +1,9 @@
 
-if (APPLE)
-    find_package(Iconv)
+# Handle the conditional finding of either system zlib or qt zlib.
+if(NOT QT_FEATURE_system_zlib)
+    find_package(Qt6 COMPONENTS ZlibPrivate)
+elseif(NOT TARGET WrapZLIB::WrapZLIB)
+    qt_find_package(WrapZLIB PROVIDED_TARGETS WrapZLIB::WrapZLIB)
 endif()
 
 qt_internal_add_3rdparty_library(BundledLibArchive
@@ -82,12 +85,11 @@ qt_internal_extend_target(BundledLibArchive CONDITION MACOS
         PLATFORM_CONFIG_H=\\\"config-macos.h\\\"
     PUBLIC_LIBRARIES
         ${FWCoreServices}
-        Iconv::Iconv
 )
 
-qt_internal_extend_target(BundledLibArchive CONDITION IOS
+qt_internal_extend_target(BundledLibArchive CONDITION APPLE
     PUBLIC_LIBRARIES
-        Iconv::Iconv
+        iconv
 )
 
 qt_internal_extend_target(BundledLibArchive CONDITION WIN32
@@ -129,11 +131,9 @@ qt_internal_extend_target(BundledLibArchive CONDITION UNIX
 )
 
 if (QT_FEATURE_system_zlib)
-    find_package(ZLIB)
-
     qt_internal_extend_target(BundledLibArchive
         LIBRARIES
-            ZLIB::ZLIB
+            WrapZLIB::WrapZLIB
     )
 else()
     qt_internal_extend_target(BundledLibArchive
diff --git a/src/plugin-interfaces/containerinterface.h b/src/plugin-interfaces/containerinterface.h
index 3b0bda87..01674044 100644
--- a/src/plugin-interfaces/containerinterface.h
+++ b/src/plugin-interfaces/containerinterface.h
@@ -32,6 +32,7 @@
 #pragma once
 
 #include <QObject>
+#include <QtPlugin>
 #include <QStringList>
 #include <QVariantMap>
 #include <QVector>
diff --git a/src/plugin-interfaces/startupinterface.h b/src/plugin-interfaces/startupinterface.h
index 0632d221..34bca53c 100644
--- a/src/plugin-interfaces/startupinterface.h
+++ b/src/plugin-interfaces/startupinterface.h
@@ -32,6 +32,7 @@
 #pragma once
 
 #include <QObject>
+#include <QtPlugin>
 
 QT_FORWARD_DECLARE_CLASS(QQmlEngine)
 QT_FORWARD_DECLARE_CLASS(QWindow)