Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev

9 files changed, 72 insertions, 12 deletions

diff --git a/Source/WebCore/bindings/scripts/preprocessor.pm b/Source/WebCore/bindings/scripts/preprocessor.pm
index cb30f80c0..eb41818cb 100644
--- a/Source/WebCore/bindings/scripts/preprocessor.pm
+++ b/Source/WebCore/bindings/scripts/preprocessor.pm
@@ -64,6 +64,9 @@ sub applyPreprocessor
     my @macros = grep { $_ } split(/\s+/, $defines); # grep skips empty macros.
     @macros = map { "-D$_" } @macros;
 
+    # Remove double quotation from $preprocessor
+    $preprocessor =~ s/\'//g;
+
     my $pid = 0;
     if ($Config{osname} eq "cygwin" || $Config{osname} eq 'MSWin32') {
         # This call can fail if Windows rebases cygwin, so retry a few times until it succeeds.
diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp
index acfc67776..b653a0fb9 100644
--- a/Source/WebCore/rendering/RenderLayerBacking.cpp
+++ b/Source/WebCore/rendering/RenderLayerBacking.cpp
@@ -315,7 +315,8 @@ void RenderLayerBacking::createPrimaryGraphicsLayer()
         m_childContainmentLayer = createGraphicsLayer("TiledBacking Flattening Layer");
 
     if (m_isMainFrameRenderViewLayer) {
-        m_graphicsLayer->setContentsOpaque(true);
+        bool viewIsTransparent = compositor()->viewHasTransparentBackground(0);
+        m_graphicsLayer->setContentsOpaque(!viewIsTransparent);
         m_graphicsLayer->setAppliesPageScale();
     }
 
diff --git a/Source/WebKit/qt/WidgetApi/qwebpage.cpp b/Source/WebKit/qt/WidgetApi/qwebpage.cpp
index 25777d8c0..f798aff3b 100644
--- a/Source/WebKit/qt/WidgetApi/qwebpage.cpp
+++ b/Source/WebKit/qt/WidgetApi/qwebpage.cpp
@@ -3348,9 +3348,7 @@ QWebPage::VisibilityState QWebPage::visibilityState() const
     \fn void QWebPage::scrollRequested(int dx, int dy, const QRect& rectToScroll)
 
     This signal is emitted whenever the content given by \a rectToScroll needs
-    to be scrolled \a dx and \a dy downwards and no view was set.
-
-    \sa view()
+    to be scrolled \a dx and \a dy downwards.
 */
 
 /*!
diff --git a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp
index db3994667..f967a45a6 100644
--- a/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp
+++ b/Source/WebKit/qt/WidgetSupport/QStyleFacadeImp.cpp
@@ -248,8 +248,8 @@ void QStyleFacadeImp::paintButton(QPainter* painter, QStyleFacade::ButtonType ty
     QWidget* widget = qobject_cast<QWidget*>(widgetForPainter(painter));
     MappedStyleOption<QStyleOptionButton> option(widget, proxyOption);
 
-    if (m_style->inherits("QWindowsVistaStyle") || QApplication::style()->inherits("QWindowsVistaStyle"))
-        option.styleObject = 0;
+    if (option.styleObject)
+        option.styleObject->setProperty("_q_no_animation", true);
 
     if (type == PushButton)
         style()->drawControl(QStyle::CE_PushButton, &option, painter, widget);
diff --git a/Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp b/Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp
index eebf20d76..8aaadb73c 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qwebloadrequest.cpp
@@ -42,7 +42,7 @@ public:
 /*!
     \qmltype WebLoadRequest
     \instantiates QWebLoadRequest
-    \inqmlmodule QtWebKit 3.0
+    \inqmlmodule QtWebKit
 
     \brief A utility class for the WebView::loadingChanged signal.
 
diff --git a/Tools/qmake/mkspecs/features/configure.prf b/Tools/qmake/mkspecs/features/configure.prf
index b139c3d4e..2ec8212f3 100644
--- a/Tools/qmake/mkspecs/features/configure.prf
+++ b/Tools/qmake/mkspecs/features/configure.prf
@@ -225,10 +225,9 @@ defineTest(finalizeConfigure) {
 
         log($${EOL}Final configuration:$${EOL}$${EOL})
 
-        debug: buildConfig += debug
-        release: buildConfig += release
-        buildConfig = $$join(buildConfig,/,,)
-        debug:release:debug_and_release:buildConfig += (combined)
+        debug:release:debug_and_release: buildConfig = debug+release
+        else: CONFIG(debug, debug|release): buildConfig = debug
+        else: buildConfig = release
 
         log(Build ......................... $$build$${EOL})
         log(Configuration ................. $$buildConfig$${EOL})
diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
index cf6aabe89..67276b74b 100644
--- a/Tools/qmake/mkspecs/features/default_post.prf
+++ b/Tools/qmake/mkspecs/features/default_post.prf
@@ -52,11 +52,12 @@ INCLUDEPATH += \
 
 CONFIG -= warn_on
 
+gcc: QMAKE_CXXFLAGS += -fno-strict-aliasing
+
 !compiling_thirdparty_code:*-g++*: QMAKE_CXXFLAGS = \
     -Wall \
     -Wextra \
     -Wreturn-type \
-    -fno-strict-aliasing \
     -Wchar-subscripts \
     -Wformat-security \
     -Wreturn-type \
diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf
index 9c524065d..fd66af670 100644
--- a/Tools/qmake/mkspecs/features/unix/default_post.prf
+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf
@@ -31,6 +31,8 @@ linux-g++*:isEqual(QT_ARCH,i386) {
         QMAKE_CXXFLAGS_DEBUG += -gstabs
         QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO -= -g
         QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -gstabs
+        # Don't use the gold linker with stabs, it uses more memory and produces larger debug binaries.
+        CONFIG -= use_gold_linker
     }
 }
 
diff --git a/dist/changes-5.4.0 b/dist/changes-5.4.0
new file mode 100644
index 000000000..cd5f058fc
--- /dev/null
+++ b/dist/changes-5.4.0
@@ -0,0 +1,56 @@
+Qt 5.4 introduces many new features and improvements as well as bugfixes
+over the 5.3.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.4
+
+The Qt version 5.4 series is binary compatible with the 5.3.x series.
+Applications compiled for 5.3 will continue to run with 5.4.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+QtWebkit
+--------
+
+ - The Qt WebKit module is considered done. Users should consider migrating to Qt WebEngine to keep up with new web features.
+ - [QTBUG-41877] Fixed regression causing network crashes on high bandwidth websites.
+
+
+QtWebkitWidgets
+---------------
+
+ - Accelerated compositing is now also supported with a QOpenGLWidget as the viewport.
+ - Accelerated 2D Canvas can now be activated to make HTML canvas elements render using the OpenGL painter.
+
+QtWebkitQML
+-----------
+
+ - Integration with QWebChannel.
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Windows
+-------
+
+ - Support for dynamic GL builds.
+ - [QTBUG-42417] Fixed occational crashes in Windows 64-bit JavaScript JIT.
+
+
+Machine architectures
+---------------------
+
+ - [QTBUG-41896] Fixed common JavaScript crashes on big-endian architectures.
+ - [QTBUG-35681] Low level interpreter is now enabled on softfp ARM ABI if VFP is available.