WIP: Prepare for QT6sandbox/jsmoeller/qt6

Change-Id: Icc01644db2d0ec22756f2194b9d48dbae60de8ff
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

12 files changed, 27 insertions, 21 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index 8a937a83..24a68dc4 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -16,4 +16,4 @@ BBFILES_DYNAMIC += " \
 
 LAYERSERIES_COMPAT_agldemo = "kirkstone"
 
-LAYERDEPENDS_agldemo = "aglcore qt5-layer openembedded-layer networking-layer multimedia-layer meta-flutter meta-app-framework"
+LAYERDEPENDS_agldemo = "aglcore qt6-layer openembedded-layer networking-layer multimedia-layer meta-flutter meta-app-framework"
diff --git a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb b/recipes-demo/cluster-dashboard/cluster-dashboard_git.bbDISABLED
index dd0e411a..dd0e411a 100644
--- a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb
+++ b/recipes-demo/cluster-dashboard/cluster-dashboard_git.bbDISABLED
diff --git a/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb b/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bbDISABLED
index 161e6652..eeba09fb 100644
--- a/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb
+++ b/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bbDISABLED
@@ -19,7 +19,7 @@ SRCREV  = "23eaf7da1f7d252aefddf9e41e52c745b7433b50"
 
 S  = "${WORKDIR}/git"
 
-inherit pkgconfig cmake_qt5 systemd
+inherit pkgconfig cmake_qt6 systemd
 
 SYSTEMD_SERVICE:${PN} = "${BPN}.service"
 
diff --git a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb b/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bbDISABLED
index d50e9dd1..d50e9dd1 100644
--- a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb
+++ b/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bbDISABLED
diff --git a/recipes-devtools/python/python3-pyqt5_5.15.1.bbappend b/recipes-devtools/python/python3-pyqt5_5.15.1.bbappendDISABLED
index 408c48b3..408c48b3 100644
--- a/recipes-devtools/python/python3-pyqt5_5.15.1.bbappend
+++ b/recipes-devtools/python/python3-pyqt5_5.15.1.bbappendDISABLED
diff --git a/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb b/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb
index c9ed07a0..5324ac40 100644
--- a/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb
+++ b/recipes-platform/images/agl-ivi-demo-platform-crosssdk.bb
@@ -10,7 +10,7 @@ inherit agl-crosssdk
 
 require agl-ivi-crosssdk.inc
 
-inherit populate_sdk_qt5
+inherit populate_sdk_qt6
 
 # Add qtwaylandscanner to the SDK
 TOOLCHAIN_HOST_TASK += "nativesdk-qtwayland-tools"
diff --git a/recipes-platform/images/agl-ivi-demo-platform.bb b/recipes-platform/images/agl-ivi-demo-platform.bb
index 2854462c..2aef5ae4 100644
--- a/recipes-platform/images/agl-ivi-demo-platform.bb
+++ b/recipes-platform/images/agl-ivi-demo-platform.bb
@@ -2,19 +2,23 @@ require agl-ivi-demo-base.bb
 
 DESCRIPTION = "AGL Qt Demo Platform image"
 
-AGL_APPS_INSTALL += " \
-    dashboard \
-    hvac \
-    ondemandnavi \
-    ${@bb.utils.contains("AGL_FEATURES", "agl-kvm-host-kuksa", "ondemandnavi-conf-kvm-demo", "ondemandnavi-conf", d)} \
-    settings \
-    mediaplayer \
-    messaging \
-    phone \
-    radio \
-    window-management-client-grpc \
-    camera-gstreamer \
-"
+AGL_APPS_INSTALL += " "
+
+#\
+#    dashboard \
+#    hvac \
+#    ondemandnavi \
+#    ${@bb.utils.contains("AGL_FEATURES", "agl-kvm-host-kuksa", "ondemandnavi-conf-kvm-demo", "ondemandnavi-conf", d)} \
+#    settings \
+#    mediaplayer \
+#    messaging \
+#    phone \
+#    radio \
+#    window-management-client-grpc \
+#    camera-gstreamer \
+#"
+#
+
 
 IMAGE_INSTALL += " \
     packagegroup-agl-demo-platform \
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
index 28f79cf2..1991a962 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@ -16,9 +16,11 @@ RDEPENDS:${PN} += "\
 
 RDEPENDS:${PN}:append = " \
     weston-ini-conf-no-activate \
-    homescreen \
-    launcher \
-    qtquickcontrols2-agl \
-    qtquickcontrols2-agl-style \
     psplash-portrait-config \
     "
+
+#    homescreen \
+#    launcher \
+#    qtquickcontrols2-agl \
+#    qtquickcontrols2-agl-style \
+#
\ No newline at end of file
diff --git a/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappend b/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappendDISABLED
index 3583515f..3583515f 100644
--- a/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappend
+++ b/recipes-platform/packagegroups/packagegroup-qt5-toolchain-target.bbappendDISABLED
diff --git a/recipes-qt/qt/qtsystems_%.bbappend b/recipes-qt/qt/qtsystems_%.bbappendDISABLED
index 4fe0f28c..4fe0f28c 100644
--- a/recipes-qt/qt/qtsystems_%.bbappend
+++ b/recipes-qt/qt/qtsystems_%.bbappendDISABLED
diff --git a/recipes-qt/qt/qtwebkit_%.bbappend b/recipes-qt/qt/qtwebkit_%.bbappendDISABLED
index d0b1302c..d0b1302c 100644
--- a/recipes-qt/qt/qtwebkit_%.bbappend
+++ b/recipes-qt/qt/qtwebkit_%.bbappendDISABLED
diff --git a/templates/feature/agl-demo/50_bblayers.conf.inc b/templates/feature/agl-demo/50_bblayers.conf.inc
index 37b44ec4..4ca1fed4 100644
--- a/templates/feature/agl-demo/50_bblayers.conf.inc
+++ b/templates/feature/agl-demo/50_bblayers.conf.inc
@@ -8,4 +8,4 @@ AGL_META_FILESYSTEMS = "${METADIR}/external/meta-openembedded/meta-filesystems"
 AGL_META_MULTIMEDIA = "${METADIR}/external/meta-openembedded/meta-multimedia"
 AGL_META_NETWORKING = "${METADIR}/external/meta-openembedded/meta-networking"
 AGL_META_PYTHON = "${METADIR}/external/meta-openembedded/meta-python"
-AGL_META_QT5 = "${METADIR}/external/meta-qt5"
+AGL_META_QT6 = "${METADIR}/external/meta-qt6"