AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qmake: make CONFIG+=egl work again

Browse Source 
while it's legacy and should not be used (use QMAKE_USE+=egl instead),
it shouldn't be broken nonetheless.

amends 310bf3f57c.

Fixes: QTBUG-72564
Change-Id: Id6a070a4653dc1182a6b4d75af027a6ee6cbacae
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
This commit is contained in:
Oswald Buddenhagen 2018-12-20 16:30:51 +01:00 committed by Oswald Buddenhagen
parent 2cd633e7ee
commit 5733dfbd90
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mkspecs/features/egl.prf
View File

@ -2,6 +2,7 @@ INCLUDEPATH += $$QMAKE_INCDIR_EGL
LIBS_PRIVATE += $$QMAKE_LIBS_EGL LIBS_PRIVATE += $$QMAKE_LIBS_EGL
QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_EGL QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_EGL
DEFINES += $$QMAKE_DEFINES_EGL
LIBS += $$QMAKE_LFLAGS_EGL LIBS += $$QMAKE_LFLAGS_EGL
for(p, QMAKE_LIBDIR_EGL) { for(p, QMAKE_LIBDIR_EGL) {
LIBS_PRIVATE += -L$$p LIBS_PRIVATE += -L$$p

4
src/platformsupport/eglconvenience/qt_egl_p.h
View File

@ -52,7 +52,9 @@
// //
#ifdef QT_EGL_NO_X11 #ifdef QT_EGL_NO_X11
# define MESA_EGL_NO_X11_HEADERS // MESA # ifndef MESA_EGL_NO_X11_HEADERS
# define MESA_EGL_NO_X11_HEADERS // MESA
# endif
# if !defined(Q_OS_INTEGRITY) # if !defined(Q_OS_INTEGRITY)
# define WIN_INTERFACE_CUSTOM // NV # define WIN_INTERFACE_CUSTOM // NV
# endif // Q_OS_INTEGRITY # endif // Q_OS_INTEGRITY