diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-03 07:22:23 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-03 07:22:23 (GMT) |
| commit | a590f7941caeb4f5c687992ddbbc6f02733b12fc (patch) | |
| tree | ac4ee2f531b43c47fdfee1d6249b5fcc6a9829f9 /src/3rdparty/webkit/WebCore | |
| parent | 133c95d4e422300305620b5d6bebad65b31f8278 (diff) | |
| download | Qt-a590f7941caeb4f5c687992ddbbc6f02733b12fc.zip Qt-a590f7941caeb4f5c687992ddbbc6f02733b12fc.tar.gz Qt-a590f7941caeb4f5c687992ddbbc6f02733b12fc.tar.bz2 | |
Updated WebKit to 8941bee5706ef2171ed5def63834deefc7440d11
Fixes integrated:
|| <https://webkit.org/b/33875> || [Qt] QWebPage::userAgentForUrl is terrible API ||
|| <https://webkit.org/b/38371> || [Qt] GraphicsLayer: animation incorrect when scrolling ||
|| <https://webkit.org/b/32196> || Make it possible to distinguish between NPAPI plugins and Application plugins ||
|| <https://webkit.org/b/37207> || [Qt] QtWebKit 2.0 library version needs to be maintained in WebCore.pro ||
Diffstat (limited to 'src/3rdparty/webkit/WebCore')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/ChangeLog | 22 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 6 |
2 files changed, 25 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index b8825bd..22315fe 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,25 @@ +2010-05-03 Thomas Zander <t.zander@nokia.com> + + Reviewed by Simon Hausmann. + + [Qt] Fix library infix usage when compiling inside of Qt + + Don't apply the infix when building inside Qt, as that's done through the + inclusion of qbase.pri. + + * WebCore.pro: + +2010-04-29 Janne Koskinen <janne.p.koskinen@digia.com> + + Reviewed by Simon Hausmann. + + [Qt] QtWebKit versioning added + https://bugs.webkit.org/show_bug.cgi?id=37207 + + QtWebkit releases separated from Qt release cycle. + + * WebCore.pro: + 2010-03-27 Robert Hogan <robert@webkit.org> Reviewed by nobody, fix typo in previous commit. diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 2a64982..626e050 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -69,13 +69,13 @@ CONFIG(standalone_package) { CONFIG(QTDIR_build) { include($$QT_SOURCE_TREE/src/qbase.pri) - # Qt will set the version for us when building in Qt's tree } else { - VERSION = $${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} DESTDIR = $$OUTPUT_DIR/lib !static: DEFINES += QT_MAKEDLL - symbian: TARGET +=$${QT_LIBINFIX} + symbian: TARGET += $${QT_LIBINFIX} } +include($$PWD/../WebKit/qt/qtwebkit_version.pri) +VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION} unix { QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork |