diff options
author | Fatih Aşıcı <fatih.asici@gmail.com> | 2015-01-22 14:37:57 +0200 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2015-02-02 21:47:39 +0100 |
commit | 9fff65cf1a1278702b5c9a5fb63e0cec583ab593 (patch) | |
tree | a3ac993acea88bb39da85e8bf861e44c2a24ce4e /package/qt5/qt5webkit/0001-egl-includepath.patch | |
parent | 59a962af7a8ef15b97724c421b8658a030e308ac (diff) | |
download | buildroot-9fff65cf1a1278702b5c9a5fb63e0cec583ab593.tar.gz buildroot-9fff65cf1a1278702b5c9a5fb63e0cec583ab593.zip |
qt5: bump to version 5.4.0
qt5base:
- Add patches to fix uClibc build.
qt5connectivity:
- Add patches to fix build with -no-c++11
qt5declarative:
- Remove the line that installs accessible plugin. The functionality
is moved into the qtquick library.
qt5webkit:
- Remove egl patch. This should be fixed with CONFIG += egl option.
qt5websockets:
- Remove upstreamed patch.
Changelogs: https://qt-project.org/wiki/Change-files-in-Qt-5.4.0
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt5/qt5webkit/0001-egl-includepath.patch')
-rw-r--r-- | package/qt5/qt5webkit/0001-egl-includepath.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/package/qt5/qt5webkit/0001-egl-includepath.patch b/package/qt5/qt5webkit/0001-egl-includepath.patch deleted file mode 100644 index de5bcff0d3..0000000000 --- a/package/qt5/qt5webkit/0001-egl-includepath.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d6b1b33a12c0cf6c52667afafe34e58a7b00d0d8 Mon Sep 17 00:00:00 2001 -From: Floris Bos <bos@je-eigen-domein.nl> -Date: Thu, 7 Mar 2013 19:25:17 +0100 -Subject: [PATCH] Webcore: add EGL and OpenGL (ES) INCDIR to INCLUDEPATH - -When building with 3D graphics support enabled, add the -OpenGL (ES) and EGL include directories to the include path. - -Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> ---- - Source/WebCore/Target.pri | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri -index 2669748..421a849 100644 ---- a/Source/WebCore/Target.pri -+++ b/Source/WebCore/Target.pri -@@ -3992,15 +3992,19 @@ use?(3D_GRAPHICS) { - - contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) { - !contains(QT_CONFIG, opengles2) { -+ INCLUDEPATH += $$QMAKE_INCDIR_OPENGL - SOURCES += \ - platform/graphics/opengl/GraphicsContext3DOpenGL.cpp \ - platform/graphics/opengl/Extensions3DOpenGL.cpp - } else { -+ INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2 - SOURCES += \ - platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp \ - platform/graphics/opengl/Extensions3DOpenGLES.cpp - } - -+ !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL -+ - HEADERS += platform/graphics/opengl/Extensions3DOpenGL.h - - SOURCES += \ --- -1.7.10.4 - |