1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for using static EGL libraries on VxWorks

Browse Source 
On VxWorks there is dlopen, but the feature can be turned off for static
builds, so Qt can use EGL even when dlopen is not present. In
qeglplatformcontext.cpp dlsym needs dlopen feature. There is no dlopen
on windows neither on Integrity.

Task-number: QTBUG-134671
Pick-to: 6.8 6.9
Change-Id: I7ced5f53ca21a8b0ceb25732ed4b1dc6c0bb1300
Reviewed-by: Janne Roine <janne.roine@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Karim Pinter 2025-03-17 16:35:44 +02:00
parent 16081f414d
commit 3c919b6d0d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/configure.cmake
View File

@ -908,7 +908,7 @@ qt_feature("openvg" PUBLIC
) )
qt_feature("egl" PUBLIC qt_feature("egl" PUBLIC
LABEL "EGL" LABEL "EGL"
CONDITION ( QT_FEATURE_opengl OR QT_FEATURE_openvg ) AND EGL_FOUND AND ( QT_FEATURE_dlopen OR NOT UNIX OR INTEGRITY ) CONDITION ( QT_FEATURE_opengl OR QT_FEATURE_openvg ) AND EGL_FOUND AND ( QT_FEATURE_dlopen OR NOT UNIX OR INTEGRITY OR VXWORKS)
) )
qt_feature_definition("egl" "QT_NO_EGL" NEGATE VALUE "1") qt_feature_definition("egl" "QT_NO_EGL" NEGATE VALUE "1")
qt_feature("egl_x11" PRIVATE qt_feature("egl_x11" PRIVATE

2
src/gui/opengl/platform/egl/qeglplatformcontext.cpp
View File

@ -431,7 +431,7 @@ QFunctionPointer QEGLPlatformContext::getProcAddress(const char *procName)
{ {
eglBindAPI(m_api); eglBindAPI(m_api);
QFunctionPointer proc = (QFunctionPointer) eglGetProcAddress(procName); QFunctionPointer proc = (QFunctionPointer) eglGetProcAddress(procName);
#if !defined(Q_OS_WIN) && !defined(Q_OS_INTEGRITY) #if QT_CONFIG(dlopen)
if (!proc) if (!proc)
proc = (QFunctionPointer) dlsym(RTLD_DEFAULT, procName); proc = (QFunctionPointer) dlsym(RTLD_DEFAULT, procName);
#elif !defined(QT_OPENGL_DYNAMIC) #elif !defined(QT_OPENGL_DYNAMIC)