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