summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Source/WebCore/ChangeLog15
-rw-r--r--Source/WebCore/WebCore.pri2
2 files changed, 16 insertions, 1 deletions
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index f43a941f0..7b841c56b 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2013-03-12 Floris Bos <bos@je-eigen-domein.nl>
+
+ [Qt] WebKit fails to compile if EGL headers are not in default INCLUDEPATH
+ https://bugs.webkit.org/show_bug.cgi?id=111859
+
+ Reviewed by Jocelyn Turcotte.
+
+ The 3D graphics code wants to include EGL header files.
+ But on some platforms such as the Raspberry Pi those are not in /usr/include
+ but in another folder.
+ Fix adds "egl" to CONFIG when OpenGL ES2 is used, so the right include
+ paths are added.
+
+ * WebCore.pri:
+
2013-01-29 Michael BrĂ¼ning <michael.bruning@digia.com>
[Qt][WK1] Reflect recursion limit and loop checks also for list conversions.
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
index 73f483008..b7cd93adf 100644
--- a/Source/WebCore/WebCore.pri
+++ b/Source/WebCore/WebCore.pri
@@ -245,7 +245,7 @@ use?(3D_GRAPHICS) {
}
}
} else {
- contains(QT_CONFIG, opengles2): LIBS += -lEGL
+ contains(QT_CONFIG, opengles2): CONFIG += egl
}
}