--- qtwebkit-opensource-src-5.0.0/WebKit.pro.orig 2013-01-04 01:50:18.373246956 +0100 +++ qtwebkit-opensource-src-5.0.0/WebKit.pro 2013-01-04 01:50:23.777286725 +0100 @@ -18,12 +18,6 @@ JavaScriptCore.makefile = Makefile.JavaScriptCore SUBDIRS += JavaScriptCore -use?(3D_GRAPHICS) { - ANGLE.file = Source/ThirdParty/ANGLE/ANGLE.pro - ANGLE.makefile = Makefile.ANGLE - SUBDIRS += ANGLE -} - use?(leveldb):!use?(system_leveldb) { leveldb.file = Source/ThirdParty/leveldb/leveldb.pro leveldb.makefile = Makefile.leveldb --- qtwebkit-opensource-src-5.0.0/Source/WebCore/Target.pri.orig 2013-01-04 01:58:25.145960916 +0100 +++ qtwebkit-opensource-src-5.0.0/Source/WebCore/Target.pri 2013-01-04 01:58:53.245166218 +0100 @@ -4194,7 +4194,7 @@ platform/graphics/texmap/coordinated/CoordinatedTile.cpp \ platform/graphics/texmap/coordinated/UpdateAtlas.cpp - INCLUDEPATH += $$PWD/platform/graphics/gpu + INCLUDEPATH += $$PWD/platform/graphics/gpu /usr/i686-w64-mingw32/sys-root/mingw/include/GLSLANG contains(QT_CONFIG, opengl) { contains(QT_CONFIG, opengles2) { --- qtwebkit-opensource-src-5.0.0/Tools/qmake/mkspecs/modules/angle.prf.orig 2013-01-04 02:25:16.357429590 +0100 +++ qtwebkit-opensource-src-5.0.0/Tools/qmake/mkspecs/modules/angle.prf 2013-01-04 02:25:29.383533741 +0100 @@ -4,6 +4,3 @@ # See 'Tools/qmake/README' for an overview of the build system # ------------------------------------------------------------------- -WEBKIT.angle.root_source_dir = $${ROOT_WEBKIT_DIR}/Source/ThirdParty/ANGLE - -include($${WEBKIT.angle.root_source_dir}/ANGLE.pri) --- qtwebkit-opensource-src-5.0.0/Source/WebKit/WebKit1.pro.orig 2013-01-04 13:58:41.258048080 +0100 +++ qtwebkit-opensource-src-5.0.0/Source/WebKit/WebKit1.pro 2013-01-04 13:59:23.135351974 +0100 @@ -96,7 +96,10 @@ INCLUDEPATH += \ $$PWD/qt/WebCoreSupport -use?(3D_GRAPHICS): WEBKIT += angle +use?(3D_GRAPHICS) { + WEBKIT += angle + INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include/GLSLANG +} have?(qtpositioning):enable?(GEOLOCATION) { HEADERS += \ --- qtwebkit-opensource-src-5.0.0/Source/WebKit2/Target.pri.orig 2013-01-04 14:01:39.267381271 +0100 +++ qtwebkit-opensource-src-5.0.0/Source/WebKit2/Target.pri 2013-01-04 14:02:01.414542791 +0100 @@ -942,7 +942,10 @@ have?(qtpositioning):enable?(GEOLOCATION): QT += positioning -use?(3D_GRAPHICS): WEBKIT += angle +use?(3D_GRAPHICS) { + WEBKIT += angle + INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include/GLSLANG +} use?(PLUGIN_BACKEND_XLIB) { DEFINES += XP_UNIX --- qtwebkit-opensource-src-5.0.0/Tools/qmake/mkspecs/features/webkit_modules.prf.orig 2013-01-04 14:37:56.650662923 +0100 +++ qtwebkit-opensource-src-5.0.0/Tools/qmake/mkspecs/features/webkit_modules.prf 2013-01-04 14:38:20.063847512 +0100 @@ -7,7 +7,7 @@ # Reorder libraries so that the link and include order is correct, # and make sure the case matches the original case. -libraries = WebKit1 WebKit2 WebCore ANGLE leveldb JavaScriptCore WTF +libraries = WebKit1 WebKit2 WebCore leveldb JavaScriptCore WTF for(library, libraries) { contains(WEBKIT, $$lower($$library)) { WEBKIT -= $$lower($$library) --- qtwebkit-opensource-src-5.0.2/Source/api.pri.orig 2013-05-18 01:36:18.524909031 +0200 +++ qtwebkit-opensource-src-5.0.2/Source/api.pri 2013-05-18 02:14:48.609146344 +0200 @@ -24,7 +24,6 @@ } build?(webkit2): QMAKE_INTERNAL_INCLUDED_FILES *= WebKit2/Target.pri -use?(3D_GRAPHICS): WEBKIT += angle use?(leveldb):!use?(system_leveldb) WEBKIT += leveldb MODULE = webkit --- qtwebkit-opensource-src-5.0.2/Source/WebCore/WebCore.pri.orig 2013-05-18 01:50:16.481110868 +0200 +++ qtwebkit-opensource-src-5.0.2/Source/WebCore/WebCore.pri 2013-05-18 02:19:24.941843621 +0200 @@ -209,6 +209,7 @@ CONFIG(debug, debug|release):contains(QT_CONFIG, angle) { LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG } else { + INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include/GLSLANG LIBS += $$QMAKE_LIBS_OPENGL_ES2 } } else {