Title: [128036] trunk/Source/WebCore
- Revision
- 128036
- Author
- [email protected]
- Date
- 2012-09-10 02:35:13 -0700 (Mon, 10 Sep 2012)
Log Message
[Qt] Fix linking of QtWebKit.dll on Windows
https://bugs.webkit.org/show_bug.cgi?id=96250
Patch by Simon Hausmann <[email protected]> on 2012-09-10
Reviewed by Kenneth Rohde Christiansen.
On Windows when using ANGLE, the DLL import library of EGL is called libEGL.lib instead of EGL.lib.
However as it turns out we do not need to explicitly link against EGL, because when Qt is configured with ANGLE
support it will do that automatically for us.
* WebCore.pri:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (128035 => 128036)
--- trunk/Source/WebCore/ChangeLog 2012-09-10 09:27:02 UTC (rev 128035)
+++ trunk/Source/WebCore/ChangeLog 2012-09-10 09:35:13 UTC (rev 128036)
@@ -1,3 +1,16 @@
+2012-09-10 Simon Hausmann <[email protected]>
+
+ [Qt] Fix linking of QtWebKit.dll on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=96250
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ On Windows when using ANGLE, the DLL import library of EGL is called libEGL.lib instead of EGL.lib.
+ However as it turns out we do not need to explicitly link against EGL, because when Qt is configured with ANGLE
+ support it will do that automatically for us.
+
+ * WebCore.pri:
+
2012-09-10 Christophe Dumez <[email protected]>
[EFL] fast/forms/menulist-restrict-line-height.html is failing
Modified: trunk/Source/WebCore/WebCore.pri (128035 => 128036)
--- trunk/Source/WebCore/WebCore.pri 2012-09-10 09:27:02 UTC (rev 128035)
+++ trunk/Source/WebCore/WebCore.pri 2012-09-10 09:35:13 UTC (rev 128036)
@@ -196,7 +196,7 @@
}
contains(DEFINES, WTF_USE_3D_GRAPHICS=1) {
- contains(QT_CONFIG, opengles2): LIBS += -lEGL
+ contains(QT_CONFIG, opengles2):!win32: LIBS += -lEGL
mac: LIBS += -framework IOSurface -framework CoreFoundation
linux-*:contains(DEFINES, HAVE_XCOMPOSITE=1): LIBS += -lXcomposite
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
