69 lines
2.5 KiB
Diff
69 lines
2.5 KiB
Diff
From 41d28983148acf80f0af2436461215ba27197cb6 Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sat, 5 Nov 2016 12:14:01 +0100
|
|
Subject: [PATCH 3/9] Use system ANGLE rather than bundled version
|
|
|
|
---
|
|
Source/api.pri | 1 -
|
|
Tools/qmake/mkspecs/features/webkit_modules.prf | 2 +-
|
|
Tools/qmake/mkspecs/modules/angle.prf | 3 ---
|
|
WebKit.pro | 6 ------
|
|
4 files changed, 1 insertion(+), 11 deletions(-)
|
|
|
|
diff --git a/Source/api.pri b/Source/api.pri
|
|
index de04652ca..f972f672f 100644
|
|
--- a/Source/api.pri
|
|
+++ b/Source/api.pri
|
|
@@ -24,7 +24,6 @@ build?(webkit1): {
|
|
}
|
|
build?(webkit2): QMAKE_INTERNAL_INCLUDED_FILES *= WebKit2/Target.pri
|
|
|
|
-use?(3D_GRAPHICS): WEBKIT += angle
|
|
use?(leveldb):!use?(system_leveldb) WEBKIT += leveldb
|
|
|
|
MODULE = webkit
|
|
diff --git a/Tools/qmake/mkspecs/features/webkit_modules.prf b/Tools/qmake/mkspecs/features/webkit_modules.prf
|
|
index 7040cbbc3..8c131754d 100644
|
|
--- a/Tools/qmake/mkspecs/features/webkit_modules.prf
|
|
+++ b/Tools/qmake/mkspecs/features/webkit_modules.prf
|
|
@@ -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)
|
|
diff --git a/Tools/qmake/mkspecs/modules/angle.prf b/Tools/qmake/mkspecs/modules/angle.prf
|
|
index 18631a76a..3b04dea53 100644
|
|
--- a/Tools/qmake/mkspecs/modules/angle.prf
|
|
+++ b/Tools/qmake/mkspecs/modules/angle.prf
|
|
@@ -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)
|
|
diff --git a/WebKit.pro b/WebKit.pro
|
|
index 11b59e58b..e9709a238 100644
|
|
--- a/WebKit.pro
|
|
+++ b/WebKit.pro
|
|
@@ -18,12 +18,6 @@ JavaScriptCore.file = Source/JavaScriptCore/JavaScriptCore.pro
|
|
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
|
|
--
|
|
2.13.2
|
|
|