diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebCore/WebCore.pri | 2 | ||||
| -rw-r--r-- | Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp | 3 | ||||
| -rw-r--r-- | Source/WebKit/qt/Api/qwebsettings.cpp | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri index 4e5e13cba..ffe389d46 100644 --- a/Source/WebCore/WebCore.pri +++ b/Source/WebCore/WebCore.pri @@ -289,7 +289,7 @@ win32 { } # Remove whole program optimizations due to miscompilations -win32-msvc2005|win32-msvc2008|win32-msvc2010|win32-msvc2012|win32-msvc2013|wince* { +win32-msvc*|wince* { QMAKE_CFLAGS_LTCG -= -GL QMAKE_CXXFLAGS_LTCG -= -GL } diff --git a/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp b/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp index 103dc1fcc..ca7b60cd2 100644 --- a/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp +++ b/Source/WebCore/platform/network/qt/SocketStreamHandleQt.cpp @@ -215,7 +215,8 @@ int SocketStreamHandle::platformSend(const char* data, int len) void SocketStreamHandle::platformClose() { LOG(Network, "SocketStreamHandle %p platformClose", this); - m_p->close(); + if (m_p) + m_p->close(); } void SocketStreamHandle::didReceiveAuthenticationChallenge(const AuthenticationChallenge&) diff --git a/Source/WebKit/qt/Api/qwebsettings.cpp b/Source/WebKit/qt/Api/qwebsettings.cpp index f55b6d721..363f58f78 100644 --- a/Source/WebKit/qt/Api/qwebsettings.cpp +++ b/Source/WebKit/qt/Api/qwebsettings.cpp @@ -519,12 +519,18 @@ QWebSettings* QWebSettings::globalSettings() enabled by default. \value CSSGridLayoutEnabled This setting enables support for the CSS 3 Grid Layout module. This CSS module is currently only a draft and support for it is disabled by default. + \value CSSRegionsEnabled This setting enables support for the CSS 3 Regions module. This + CSS module is currently only a draft and support for it is enabled by default. \value ScrollAnimatorEnabled This setting enables animated scrolling. It is disabled by default. \value CaretBrowsingEnabled This setting enables caret browsing. It is disabled by default. \value NotificationsEnabled Specifies whether support for the HTML 5 web notifications is enabled or not. This is enabled by default. \value Accelerated2dCanvasEnabled Specifies whether the HTML5 2D canvas should be a OpenGL framebuffer. This makes many painting operations faster, but slows down pixel access. This is disabled by default. + \value WebGLEnabled This setting enables support for WebGL. + It is enabled by default. + \value HyperlinkAuditingEnabled This setting enables support for hyperlink auditing (<a ping>). + It is disabled by default. */ /*! |