diff options
| author | michael.bruning@digia.com <michael.bruning@digia.com> | 2013-01-24 12:19:50 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-24 17:49:00 +0100 |
| commit | 81cb91bb6b34f10cb4f1e8da9a0dccc6a9b4a2c4 (patch) | |
| tree | aa1fe97111b0acd078457d10688117eef0119056 | |
| parent | 82dc890b968922cecfa59a910f6dcb33fc35eb75 (diff) | |
| download | qtwebkit-81cb91bb6b34f10cb4f1e8da9a0dccc6a9b4a2c4.tar.gz | |
[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
Change-Id: Iad260dbc0bd85ba45c4cd8ccfd5e12f5bef52998
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@140675 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | Source/WebCore/ChangeLog | 11 | ||||
| -rw-r--r-- | Source/WebCore/WebCore.pri | 6 |
2 files changed, 16 insertions, 1 deletions
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 7b3d70b5a..ac0c2f769 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,14 @@ +2013-01-24 Kai Koehne <kai.koehne@digia.com> + + [Qt] Webkit debug build links against release binaries of ANGLE libEGL, libGLESv2 + https://bugs.webkit.org/show_bug.cgi?id=106217 + + Reviewed by Jocelyn Turcotte. + + Use libEGLd, libEGLSv2d if qtbase was compiled with ANGLE. + + * WebCore.pri: Mirror logic of qtbase\mkspecs\features\win32\opengl.prf + 2012-12-19 Simon Hausmann <simon.hausmann@digia.com>, Jedrzej Nowacki <jedrzej.nowacki@digia.com> [Qt] JS bridge does not transmit QVariants anymore in Qt5 diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri index 6608faa07..6c83126f0 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -213,7 +213,11 @@ use?(3D_GRAPHICS) { win32-g++: { # Make sure OpenGL libs are after the webcore lib so MinGW can resolve symbols contains(QT_CONFIG, opengles2) { - LIBS += $$QMAKE_LIBS_OPENGL_ES2 + CONFIG(debug, debug|release):contains(QT_CONFIG, angle) { + LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG + } else { + LIBS += $$QMAKE_LIBS_OPENGL_ES2 + } } else { LIBS += $$QMAKE_LIBS_OPENGL } |