diff options
| author | Ari Parkkila <ari.parkkila@qt.io> | 2025-09-15 09:55:55 +0300 |
|---|---|---|
| committer | Ari Parkkila <ari.parkkila@qt.io> | 2025-10-13 12:24:39 +0300 |
| commit | d97c65b791400775b5de021c9fea9bd961033aa0 (patch) | |
| tree | 3a79b548dba4ce66a468a0d65fc9a50745408349 | |
| parent | 3e17824267a1febbc2cb952c52c13171f843276f (diff) | |
Fix qtbase compiling
QtBase is missing proper casts for definitions of EGLNativeDisplayType,
EGLNativeWindowType and EGLNativePixmapType in EGL/eglplatform.h.
Task-number: QTBUG-130703
Change-Id: I5b7228a716f5a66071c83a4e9688aae0364861fd
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | recipes-qt/qtbase/qtbase/0001-Fix-casting-of-egl.h-types.patch | 40 | ||||
| -rw-r--r-- | recipes-qt/qtbase/qtbase_%.bbappend | 5 |
2 files changed, 45 insertions, 0 deletions
diff --git a/recipes-qt/qtbase/qtbase/0001-Fix-casting-of-egl.h-types.patch b/recipes-qt/qtbase/qtbase/0001-Fix-casting-of-egl.h-types.patch new file mode 100644 index 0000000..d43b0a9 --- /dev/null +++ b/recipes-qt/qtbase/qtbase/0001-Fix-casting-of-egl.h-types.patch @@ -0,0 +1,40 @@ +From 4435e51ab807ff9439ab49a4e6416309aa289ad4 Mon Sep 17 00:00:00 2001 +From: Ari Parkkila <ari.parkkila@qt.io> +Date: Thu, 14 Nov 2024 11:04:21 +0200 +Subject: [PATCH] Fix casting of egl.h types + +Upstream-Status: Inappropriate [upstream ticket https://bugreports.qt.io/browse/QTBUG-130703] +--- + src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp | 2 +- + .../deviceintegration/eglfs_emu/qeglfsemulatorintegration.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp +index 56fda45e90..2fefda022e 100644 +--- a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp ++++ b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp +@@ -123,7 +123,7 @@ EGLNativeDisplayType QEglFSDeviceIntegration::platformDisplay() const + { + bool displayOk; + const int defaultDisplay = qEnvironmentVariableIntValue("QT_QPA_EGLFS_DEFAULT_DISPLAY", &displayOk); +- return displayOk ? EGLNativeDisplayType(quintptr(defaultDisplay)) : EGL_DEFAULT_DISPLAY; ++ return displayOk ? (EGLNativeDisplayType)(quintptr(defaultDisplay)) : EGL_DEFAULT_DISPLAY; + } + + EGLDisplay QEglFSDeviceIntegration::createDisplay(EGLNativeDisplayType nativeDisplay) +diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorintegration.cpp +index a63aafa242..8483ebe028 100644 +--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorintegration.cpp ++++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorintegration.cpp +@@ -94,7 +94,7 @@ EGLNativeWindowType QEglFSEmulatorIntegration::createNativeWindow(QPlatformWindo + setDisplay(screen->id()); + } + Q_CONSTINIT static QBasicAtomicInt uniqueWindowId = Q_BASIC_ATOMIC_INITIALIZER(0); +- return EGLNativeWindowType(qintptr(1 + uniqueWindowId.fetchAndAddRelaxed(1))); ++ return (EGLNativeWindowType)(qintptr(1 + uniqueWindowId.fetchAndAddRelaxed(1))); + } + + QT_END_NAMESPACE +-- +2.34.1 + diff --git a/recipes-qt/qtbase/qtbase_%.bbappend b/recipes-qt/qtbase/qtbase_%.bbappend new file mode 100644 index 0000000..d704f7c --- /dev/null +++ b/recipes-qt/qtbase/qtbase_%.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI += "\ + file://0001-Fix-casting-of-egl.h-types.patch \ +" |