Changeset 128036 in webkit

Timestamp:

Sep 10, 2012 2:35:13 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Fix linking of QtWebKit.dll on Windows
​https://bugs.webkit.org/show_bug.cgi?id=96250

Patch by Simon Hausmann <​simon.hausmann@nokia.com> 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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.pri (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-10  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [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  <christophe.dumez@intel.com>
 

trunk/Source/WebCore/WebCore.pri

@@ -197 +197 @@
 
 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