From 37ed99a30839696a95c498f7d99a3505936ac29c Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 15 Jun 2010 10:25:24 +0200 Subject: Updated WebKit to 40c2d6907ef75288b4f15e7fad334b9138acdbbf Integrated fix: || || [Qt] The qt_webkit_version.pri file gets overwritten on install || --- mkspecs/modules/qt_webkit_version.pri | 6 ++++-- src/3rdparty/webkit/.tag | 2 +- src/3rdparty/webkit/VERSION | 2 +- src/3rdparty/webkit/WebCore/ChangeLog | 13 +++++++++++++ src/3rdparty/webkit/WebCore/WebCore.pri | 2 +- src/3rdparty/webkit/WebCore/WebCore.pro | 7 +------ 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/mkspecs/modules/qt_webkit_version.pri b/mkspecs/modules/qt_webkit_version.pri index 0370720..ffd192c 100644 --- a/mkspecs/modules/qt_webkit_version.pri +++ b/mkspecs/modules/qt_webkit_version.pri @@ -1,2 +1,4 @@ -# The version information comes from our copy of -include($$PWD/../../src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri) +QT_WEBKIT_VERSION = 4.7.0 +QT_WEBKIT_MAJOR_VERSION = 4 +QT_WEBKIT_MINOR_VERSION = 7 +QT_WEBKIT_PATCH_VERSION = 0 diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index 125e175..07a02d7 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -0f8941d0dd5f947530e1dc55b859d810bba14764 +40c2d6907ef75288b4f15e7fad334b9138acdbbf diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 6aaae4f..b648b94 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from and has the sha1 checksum - f943ead2759537527faa7f3cb057d995291663b9 + 40c2d6907ef75288b4f15e7fad334b9138acdbbf diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index e04729d..6a7da30 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,16 @@ +2010-06-15 Jocelyn Turcotte + + Reviewed by Simon Hausmann. + + [Qt] The qt_webkit_version.pri file gets overwritten on install + https://bugs.webkit.org/show_bug.cgi?id=40487 + + Don't install qt_webkit_version.pri when building WebKit inside of Qt. + The import of WebKit into Qt will take care of providing the file + in mkspecs/modules and it'll be installed through projects.pro. + + * WebCore.pro: + 2010-06-13 Noam Rosenthal Reviewed by Eric Seidel. diff --git a/src/3rdparty/webkit/WebCore/WebCore.pri b/src/3rdparty/webkit/WebCore/WebCore.pri index 9debd6a..97ae526 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pri +++ b/src/3rdparty/webkit/WebCore/WebCore.pri @@ -107,7 +107,7 @@ greaterThan(QT_MINOR_VERSION, 5) { !lessThan(QT_MINOR_VERSION, 7) { DEFINES += ENABLE_QT_BEARER=1 } else { - load(mobilityconfig) + load(mobilityconfig, true) contains(MOBILITY_CONFIG, bearer) { DEFINES += ENABLE_QT_BEARER=1 } diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 048fc93..07ef474 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -2845,12 +2845,7 @@ contains(DEFINES, ENABLE_SYMBIAN_DIALOG_PROVIDERS) { include($$PWD/../WebKit/qt/Api/headers.pri) HEADERS += $$WEBKIT_API_HEADERS -CONFIG(QTDIR_build) { - modfile.files = $$moduleFile - modfile.path = $$[QMAKE_MKSPECS]/modules - - INSTALLS += modfile -} else { +!CONFIG(QTDIR_build) { exists($$OUTPUT_DIR/include/QtWebKit/classheaders.pri): include($$OUTPUT_DIR/include/QtWebKit/classheaders.pri) WEBKIT_INSTALL_HEADERS = $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS -- cgit v0.12