Fixup qt6 packaging

falkTX · falkTX · commit bb4db9996ee5 · 2024-01-10T15:50:10.000+01:00
Signed-off-by: falkTX &lt;falktx@falktx.com&gt;
diff --git a/global-packages/buildroot-2023.11-rc1/qt6/qt6base/qt6base.mk b/global-packages/buildroot-2023.11-rc1/qt6/qt6base/qt6base.mk
@@ -260,7 +260,7 @@ ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP),y)
 QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengl_desktop=ON
 QT6BASE_DEPENDENCIES += libgl
 else ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_ES2),y)
-QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengles2=ON
+QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengl_desktop=OFF -DFEATURE_opengles2=ON
 QT6BASE_DEPENDENCIES += libgles
 else
 QT6BASE_CONF_OPTS += -DFEATURE_opengl=OFF -DINPUT_opengl=no
diff --git a/global-packages/buildroot-2023.11-rc1/qt6/qt6core5compat/Config.in b/global-packages/buildroot-2023.11-rc1/qt6/qt6core5compat/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_QT6CORE5COMPAT
 	bool "qt6core5compat"
 	select BR2_PACKAGE_QT6BASE_XML
+	select BR2_PACKAGE_QT6DECLARATIVE
 	help
 	  Qt is a cross-platform application and UI framework for
 	  developers using C++.
diff --git a/global-packages/buildroot-2023.11-rc1/qt6/qt6core5compat/qt6core5compat.mk b/global-packages/buildroot-2023.11-rc1/qt6/qt6core5compat/qt6core5compat.mk
@@ -34,6 +34,6 @@ QT6CORE5COMPAT_CONF_OPTS = \
 
 QT6CORE5COMPAT_DEPENDENCIES = \
 	host-pkgconf \
-	qt6base
+	qt6declarative
 
 $(eval $(cmake-package))
