diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-04-26 15:14:18 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-04-26 15:14:18 (GMT) |
| commit | bf3c776cf5369fd83c54a96a4e381774ab037c08 (patch) | |
| tree | 5b05b8712196d5d9f33882f2509b194fa5c3c79c /src/3rdparty/webkit/WebCore | |
| parent | 701ba6c990da06239670e378441b246b91ac2f07 (diff) | |
| download | Qt-bf3c776cf5369fd83c54a96a4e381774ab037c08.zip Qt-bf3c776cf5369fd83c54a96a4e381774ab037c08.tar.gz Qt-bf3c776cf5369fd83c54a96a4e381774ab037c08.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 4fb414b38f7c7c8439ce6a4323f1acb057a3ff20 )
Changes in WebKit/qt since the last update:
++ b/WebKit/qt/ChangeLog
2010-04-26 Thiago Macieira <thiago.macieira@nokia.com>
Reviewed by Simon Hausmann.
[Qt] Fix the include header <qstring.h> -> <QtCore/qstring.h>
The module/header.h style inclusion removes the need to have -I$QTDIR/include/depending-module
in the include search path for the application.
* Api/qwebkitversion.h:
Diffstat (limited to 'src/3rdparty/webkit/WebCore')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/ChangeLog | 24 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/platform/network/ResourceRequestBase.cpp | 8 |
3 files changed, 33 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index fa7e4f0..5e63c7c 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,27 @@ +2010-04-26 Simon Hausmann <simon.hausmann@nokia.com> + + Reviewed by Kenneth Rohde Christiansen. + + [Qt] Fix compilation with RVCT 4 + https://bugs.webkit.org/show_bug.cgi?id=37727 + + Swap extern and declspec to fix visibility of symbol imported from QtGui. + + * page/qt/EventHandlerQt.cpp: + +2010-04-26 Markus Goetz <Markus.Goetz@nokia.com> + + Reviewed by Simon Hausmann. + + [Qt] HTTP pipelining efficiency increase + https://bugs.webkit.org/show_bug.cgi?id=38062 + + Increase number of network requests that are fed into + QNetworkAccessManager. + + * platform/network/qt/ResourceRequestQt.cpp: + (WebCore::initializeMaximumHTTPConnectionCountPerHost): + 2009-11-03 Dan Bernstein <mitz@apple.com> Reviewed by Dave Hyatt. diff --git a/src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp b/src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp index 7563459..f06671d 100644 --- a/src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp +++ b/src/3rdparty/webkit/WebCore/page/qt/EventHandlerQt.cpp @@ -51,7 +51,7 @@ #include "NotImplemented.h" QT_BEGIN_NAMESPACE -Q_DECL_IMPORT extern bool qt_tab_all_widgets; // from qapplication.cpp +Q_GUI_EXPORT extern bool qt_tab_all_widgets; // from qapplication.cpp QT_END_NAMESPACE namespace WebCore { diff --git a/src/3rdparty/webkit/WebCore/platform/network/ResourceRequestBase.cpp b/src/3rdparty/webkit/WebCore/platform/network/ResourceRequestBase.cpp index e0707d9..18841c8 100644 --- a/src/3rdparty/webkit/WebCore/platform/network/ResourceRequestBase.cpp +++ b/src/3rdparty/webkit/WebCore/platform/network/ResourceRequestBase.cpp @@ -381,9 +381,17 @@ void ResourceRequestBase::updateResourceRequest() const #if !PLATFORM(MAC) && !USE(CFNETWORK) && !USE(SOUP) && !PLATFORM(CHROMIUM) unsigned initializeMaximumHTTPConnectionCountPerHost() { +#if PLATFORM(QT) +#ifdef Q_OS_SYMBIAN + return 3 * (1 + 3 + 2); +#else + return 6 * (1 + 3 + 2); +#endif +#else // This is used by the loader to control the number of issued parallel load requests. // Four seems to be a common default in HTTP frameworks. return 4; +#endif } #endif |