Changeset 140675 in webkit


Ignore:
Timestamp:
Jan 24, 2013 4:19:50 AM (11 years ago)
Author:
michael.bruning@digia.com
Message:

[Qt] Webkit debug build links against release binaries of ANGLE libEGL, libGLESv2
​https://bugs.webkit.org/show_bug.cgi?id=106217

Patch by Kai Koehne <​kai.koehne@digia.com> on 2013-01-24
Reviewed by Jocelyn Turcotte.

Use libEGLd, libEGLSv2d if qtbase was compiled with ANGLE.

  • WebCore.pri: Mirror logic of qtbase\mkspecs\features\win32\opengl.prf
Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r140672 r140675  
     12013-01-24  Kai Koehne  <kai.koehne@digia.com>
     2
     3        [Qt] Webkit debug build links against release binaries of ANGLE libEGL, libGLESv2
     4        https://bugs.webkit.org/show_bug.cgi?id=106217
     5
     6        Reviewed by Jocelyn Turcotte.
     7
     8        Use libEGLd, libEGLSv2d if qtbase was compiled with ANGLE.
     9
     10        * WebCore.pri: Mirror logic of qtbase\mkspecs\features\win32\opengl.prf
     11
    1122013-01-24  Sergio Villar Senin  <svillar@igalia.com>
    213

  • trunk/Source/WebCore/WebCore.pri

    r139446 r140675  
    220220            # Make sure OpenGL libs are after the webcore lib so MinGW can resolve symbols
    221221            contains(QT_CONFIG, opengles2) {
    222                 LIBS += $$QMAKE_LIBS_OPENGL_ES2
     222                CONFIG(debug, debug|release):contains(QT_CONFIG, angle) {
     223                    LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG
     224                } else {
     225                    LIBS += $$QMAKE_LIBS_OPENGL_ES2
     226                }
    223227            } else {
    224228                LIBS += $$QMAKE_LIBS_OPENGL
Note: See TracChangeset for help on using the changeset viewer.