[mingw-qt5-qtwebkit] Initial import
Erik van Pienbroek
epienbro at fedoraproject.org
Wed Mar 5 23:58:56 UTC 2014
commit 17b50fbf5acf008a2da6642ee1ad8d72a5b8ee82
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Thu Mar 6 00:58:46 2014 +0100
Initial import
changeset_150223.diff | 11 +++++++++++
qt5-qtwebkit-use-correct-icu-libs.patch | 4 ++--
qtwebkit-dont-use-bundled-angle-libraries.patch | 9 +--------
3 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/changeset_150223.diff b/changeset_150223.diff
new file mode 100644
index 0000000..08ee974
--- /dev/null
+++ b/changeset_150223.diff
@@ -0,0 +1,11 @@
+Index: trunk/Tools/qmake/mkspecs/features/functions.prf
+===================================================================
+--- trunk/Tools/qmake/mkspecs/features/functions.prf (revision 150222)
++++ trunk/Tools/qmake/mkspecs/features/functions.prf (revision 150223)
+@@ -205,5 +205,5 @@
+
+ defineTest(programExistsInPath) {
+- win_cmd_shell: program = $${1}.exe
++ win32: program = $${1}.exe
+ else: program = $$1
+
diff --git a/qt5-qtwebkit-use-correct-icu-libs.patch b/qt5-qtwebkit-use-correct-icu-libs.patch
index 77e1ae4..c39e2c4 100644
--- a/qt5-qtwebkit-use-correct-icu-libs.patch
+++ b/qt5-qtwebkit-use-correct-icu-libs.patch
@@ -5,7 +5,7 @@
} else {
contains(QT_CONFIG,icu) {
- win32: LIBS += -licuin -licuuc -licudt
-+ win32:!win32-g++*: LIBS += -licuin -licuuc -licudt
++ win32:!mingw: LIBS += -licuin -licuuc -licudt
+ else:!contains(QT_CONFIG,no-pkg-config):packagesExist("icu-i18n"): PKGCONFIG *= icu-i18n
else:android: LIBS += -licui18n -licuuc
else: LIBS += -licui18n -licuuc -licudata
- }
diff --git a/qtwebkit-dont-use-bundled-angle-libraries.patch b/qtwebkit-dont-use-bundled-angle-libraries.patch
index f73c9e6..90ab693 100644
--- a/qtwebkit-dont-use-bundled-angle-libraries.patch
+++ b/qtwebkit-dont-use-bundled-angle-libraries.patch
@@ -89,14 +89,7 @@
--- 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
-@@ -208,12 +208,13 @@
-
- use?(3D_GRAPHICS) {
- win32: {
-- win32-g++: {
-+ win32-g++*: {
- # Make sure OpenGL libs are after the webcore lib so MinGW can resolve symbols
- contains(QT_CONFIG, opengles2) {
+@@ -209,6 +209,7 @@
CONFIG(debug, debug|release):contains(QT_CONFIG, angle) {
LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG
} else {
More information about the scm-commits
mailing list