2011-03-28 Andras Becsi <abecsi@webkit.org>

        Reviewed by Csaba Osztrogonác.

        [Qt] QtWebKit does not link with --3d-canvas using MinGW
        https://bugs.webkit.org/show_bug.cgi?id=57225

        * QtWebKit.pro: Append the OpenGL libraries on MinGW so it can resolve symbols.

git-svn-id: svn://svn.chromium.org/blink/trunk@82115 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/WebKit/qt/ChangeLog

+2011-03-28  Andras Becsi  <abecsi@webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        [Qt] QtWebKit does not link with --3d-canvas using MinGW
+        https://bugs.webkit.org/show_bug.cgi?id=57225
+
+        * QtWebKit.pro: Append the OpenGL libraries on MinGW so it can resolve symbols.
+
 2011-03-28  Csaba Osztrogonác  <ossy@webkit.org>
 
         Reviewed by Andreas Kling.

third_party/WebKit/Source/WebKit/qt/QtWebKit.pro

@@ -42,6 +42,11 @@ isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
 
 contains(QT_CONFIG, embedded):CONFIG += embedded
 
+win32*:!win32-msvc* {
+    # Make sure OpenGL libs are after the webcore lib so MinGW can resolve symbols
+    contains(DEFINES, ENABLE_WEBGL=1)|contains(CONFIG, texmap): LIBS += $$QMAKE_LIBS_OPENGL
+}
+
 moduleFile=$$PWD/qt_webkit_version.pri
 isEmpty(QT_BUILD_TREE):include($$moduleFile)
 VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION}