diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 16:14:27 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 16:14:40 +0100 |
| commit | 9081aae061b8d017ee492fcdeacd0d2e75c19657 (patch) | |
| tree | 57b41f085196e0852feb6a409a0e0607fae58d9d | |
| parent | 4bf31f298fa3d49bd56abfd52e5d1693fa7ed554 (diff) | |
| parent | 30400131a4c18e9a0e0895d517c620b599aaddee (diff) | |
| download | qtwebkit-9081aae061b8d017ee492fcdeacd0d2e75c19657.tar.gz | |
Merge branch 'release' into stable
Conflicts:
Source/WebCore/ChangeLog
Source/WebKit/qt/ChangeLog
Change-Id: Id01082a2a19811f59b08068331a658afe9eefbdb
| -rw-r--r-- | Source/WebCore/ChangeLog | 11 | ||||
| -rw-r--r-- | Source/WebCore/WebCore.pri | 6 | ||||
| -rw-r--r-- | Source/qtwebkit.qdocconf | 4 |
3 files changed, 18 insertions, 3 deletions
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index fc66a0766..48894850e 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -259,6 +259,17 @@ (WebCore::StylePropertySet::fontValue): * css/StylePropertySet.h: +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 0faf4ad71..2ac0dd7ad 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -211,7 +211,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 } diff --git a/Source/qtwebkit.qdocconf b/Source/qtwebkit.qdocconf index f10ef279e..7c50840e8 100644 --- a/Source/qtwebkit.qdocconf +++ b/Source/qtwebkit.qdocconf @@ -2,14 +2,14 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtWebKit description = "Qt WebKit API Documentation" -version = 5.0.0 +version = 5.0.1 # Defines the name of the project. You cannot use operators (+, =, -) in # the name. Properties for this project are set using a qhp.<projectname>.property # format. qhp.projects = QtWebKit qhp.QtWebKit.file = qtwebkit.qhp -qhp.QtWebKit.namespace = org.qt-project.qtwebkit.500 +qhp.QtWebKit.namespace = org.qt-project.qtwebkit.501 qhp.QtWebKit.indexTitle = Qt WebKit qhp.QtWebKit.virtualFolder = qtwebkit |