diff options
Diffstat (limited to 'qt5-use-external-angle-library.patch')
| -rw-r--r-- | qt5-use-external-angle-library.patch | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/qt5-use-external-angle-library.patch b/qt5-use-external-angle-library.patch index bbdda14974bc..383bb8c6f0d0 100644 --- a/qt5-use-external-angle-library.patch +++ b/qt5-use-external-angle-library.patch @@ -4,31 +4,31 @@ diff -U 3 -r a/src/gui/gui.pro b/src/gui/gui.pro @@ -17,10 +17,5 @@ imageformats \ egldeviceintegrations - + -# This is here only because the platform plugin is no module, obviously. -win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) { - MODULE_AUX_INCLUDES = \ - \$\$QT_MODULE_INCLUDE_BASE/QtANGLE -} - + # Code coverage with TestCocoon @@ -35,6 +29,10 @@ - + mac:!ios: LIBS_PRIVATE += -framework Cocoa - + +win32:contains(QT_CONFIG, angle) { + LIBS_PRIVATE += -lGLESv2 +} + CONFIG += simd optimize_full - + include(accessible/accessible.pri) diff -U 3 -r a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in --- a/src/gui/Qt5GuiConfigExtras.cmake.in 2015-06-29 14:04:51.000000000 -0600 +++ b/src/gui/Qt5GuiConfigExtras.cmake.in 2015-07-18 10:51:09.666053970 -0600 @@ -2,9 +2,9 @@ !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) - + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) -set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") +set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\") @@ -36,19 +36,17 @@ diff -U 3 -r a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras. -set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") +set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR\") !!ENDIF - + _qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS}) diff -U 3 -r a/src/opengl/opengl.pro b/src/opengl/opengl.pro --- a/src/opengl/opengl.pro 2015-06-29 14:04:05.000000000 -0600 +++ b/src/opengl/opengl.pro 2015-07-18 10:46:46.588388411 -0600 -@@ -12,6 +12,9 @@ - +@@ -12,6 +12,7 @@ + contains(QT_CONFIG, opengl):CONFIG += opengl contains(QT_CONFIG, opengles2):CONFIG += opengles2 -+win32:contains(QT_CONFIG, angle) { -+ LIBS_PRIVATE += -lGLESv2 -+} - ++win32:contains(QT_CONFIG, angle): LIBS_PRIVATE += -lGLESv2 + HEADERS += qgl.h \ qgl_p.h \ @@ -57,10 +55,10 @@ diff -U 3 -r a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms +++ b/src/plugins/platforms/windows/windows.pri 2015-07-18 10:53:45.585348009 -0600 @@ -3,6 +3,7 @@ !wince*:LIBS *= -luser32 -lwinspool -limm32 -lwinmm -loleaut32 - + contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):!contains(QT_CONFIG, dynamicgl): LIBS *= -lopengl32 +contains(QT_CONFIG, angle):LIBS += -lGLESv2 -lEGL - + mingw: LIBS *= -luuid # For the dialog helpers: diff -U 3 -r a/src/src.pro b/src/src.pro |