72 lines
2.8 KiB
Diff
72 lines
2.8 KiB
Diff
--- a/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in 2014-12-05 09:24:36.000000000 -0700
|
|
+++ b/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in 2014-12-11 10:19:51.599972209 -0700
|
|
@@ -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\")
|
|
!!ELSE
|
|
-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})
|
|
--- a/qtbase/src/gui/gui.pro 2014-12-05 09:24:35.000000000 -0700
|
|
+++ b/qtbase/src/gui/gui.pro 2014-12-11 10:22:37.644366784 -0700
|
|
@@ -18,12 +18,6 @@ MODULE_PLUGIN_TYPES = \
|
|
imageformats \
|
|
egldeviceintegrations
|
|
|
|
-# This is here only because the platform plugin is no module, obviously.
|
|
-qtConfig(angle) {
|
|
- MODULE_AUX_INCLUDES = \
|
|
- \$\$QT_MODULE_INCLUDE_BASE/QtANGLE
|
|
-}
|
|
-
|
|
# Code coverage with TestCocoon
|
|
# The following is required as extra compilers use $$QMAKE_CXX instead of $(CXX).
|
|
# Without this, testcocoon.prf is read only after $$QMAKE_CXX is used by the
|
|
@@ -35,6 +29,8 @@ testcocoon {
|
|
osx: LIBS_PRIVATE += -framework AppKit
|
|
darwin: LIBS_PRIVATE += -framework CoreGraphics
|
|
|
|
+win32:qtConfig(angle): LIBS_PRIVATE += -lGLESv2
|
|
+
|
|
CONFIG += simd optimize_full
|
|
|
|
include(accessible/accessible.pri)
|
|
--- a/qtbase/src/opengl/opengl.pro 2014-12-05 09:24:31.000000000 -0700
|
|
+++ b/qtbase/src/opengl/opengl.pro 2014-12-11 10:15:45.884805707 -0700
|
|
@@ -10,6 +10,7 @@ QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf
|
|
|
|
qtConfig(opengl): CONFIG += opengl
|
|
qtConfig(opengles2): CONFIG += opengles2
|
|
+win32:qtConfig(angle): LIBS_PRIVATE += -lGLESv2
|
|
|
|
HEADERS += qgl.h \
|
|
qgl_p.h \
|
|
--- a/qtbase/src/plugins/platforms/windows/windows.pri 2014-12-05 09:24:37.000000000 -0700
|
|
+++ b/qtbase/src/plugins/platforms/windows/windows.pri 2014-12-11 10:13:45.228261276 -0700
|
|
@@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
|
|
QT_FOR_CONFIG += gui
|
|
|
|
qtConfig(opengl):!qtConfig(opengles2):!qtConfig(dynamicgl): LIBS *= -lopengl32
|
|
+qtConfig(angle):LIBS += -lGLESv2 -lEGL
|
|
|
|
mingw: LIBS *= -luuid
|
|
# For the dialog helpers:
|
|
--- a/qtbase/src/src.pro 2014-12-05 09:24:31.000000000 -0700
|
|
+++ b/qtbase/src/src.pro 2014-12-11 10:06:14.882845813 -0700
|
|
@@ -199,10 +199,6 @@ qtConfig(gui) {
|
|
SUBDIRS += src_3rdparty_harfbuzzng
|
|
src_gui.depends += src_3rdparty_harfbuzzng
|
|
}
|
|
- qtConfig(angle) {
|
|
- SUBDIRS += src_angle
|
|
- src_gui.depends += src_angle
|
|
- }
|
|
qtConfig(png):!qtConfig(system-png) {
|
|
SUBDIRS += src_3rdparty_libpng
|
|
src_3rdparty_freetype.depends += src_3rdparty_libpng
|