From 9bdf322cea922d689758cfa6eefcd09d296f28bd Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 21 Oct 2015 22:34:22 -0700 Subject: Fix the build with non-standard qtlibinfix builds When qtlibinfix contains non-identifier characters (like '.'), you can't pass BUILDING_$${TARGET} since TARGET has already been modified by qt_module.prf. Change-Id: I22045d72c63a4741b83fffff140f6b7509c1e2c5 Reviewed-by: Allan Sandfeld Jensen --- Tools/qmake/mkspecs/features/default_post.prf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf index 39bb3f7ae..19313d087 100644 --- a/Tools/qmake/mkspecs/features/default_post.prf +++ b/Tools/qmake/mkspecs/features/default_post.prf @@ -263,7 +263,8 @@ QMAKE_EXTRA_TARGETS += incremental contains(TEMPLATE, lib) { # Triggers the right export macros for WebKit internals - DEFINES += BUILDING_$${TARGET} + # (don't set for Qt modules; qt_module.prf does it) + !creating_module: DEFINES += BUILDING_$${TARGET} # Triggers the right export macro for the QtWebKit API (see qwebkitglobal.h) !contains(QT, webkit)|equals(MODULE, webkitwidgets): DEFINES += BUILDING_WEBKIT -- cgit v1.2.3 From c48fd0cbb55bf07cf86a2313fd8fbb58c40f606f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 11 May 2016 18:02:48 +0200 Subject: QT_CONFIG simplification re debug_and_release and build_all don't pretend that these two flags can be set separately - the configures set them in tandem. Change-Id: I90691b78723b79df0fdfa81a6ee81191595582c6 Reviewed-by: Joerg Bornemann --- Source/WebKit2/WebProcess.pro | 2 +- Tools/qmake/mkspecs/features/default_pre.prf | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/WebKit2/WebProcess.pro b/Source/WebKit2/WebProcess.pro index 3463b9431..d401dc23a 100644 --- a/Source/WebKit2/WebProcess.pro +++ b/Source/WebKit2/WebProcess.pro @@ -5,7 +5,7 @@ # ------------------------------------------------------------------- TEMPLATE = app -!build_pass:contains(QT_CONFIG, debug_and_release):contains(QT_CONFIG, build_all): CONFIG += release +!build_pass:contains(QT_CONFIG, debug_and_release): CONFIG += release TARGET = QtWebProcess DESTDIR = $${ROOT_BUILD_DIR}/bin diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index dbad90d5f..b07481629 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -102,8 +102,7 @@ gcc:isEqual(QT_ARCH, "arm"): CONFIG -= use_gold_linker # Pick up Qt's defaults for debug/release/debug_and_release if(win32|mac):!macx-xcode { - contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release - contains(QT_CONFIG, build_all): CONFIG += build_all + contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release build_all } FLEX = flex -- cgit v1.2.3 From e64ad7395b4dd3deb4409c3f5a30e5eed6581a1c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 19 May 2016 13:27:52 +0200 Subject: Bump version Change-Id: I2c8ef44a746940e6783586e31b1b13b70e8c4fc8 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index d3a37eb80..bffb33969 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ MODULE_QMAKE_OUTDIR = $$shadowed($$PWD/Tools/qmake) QMAKEPATH += $$PWD/Tools/qmake $$MODULE_QMAKE_OUTDIR load(qt_build_config) -MODULE_VERSION = 5.6.1 +MODULE_VERSION = 5.6.2 -- cgit v1.2.3 From 189e9c2d3248cc5f4d02f6b7905c9938342a3d2e Mon Sep 17 00:00:00 2001 From: Arunprasad Rajkumar Date: Mon, 19 Aug 2013 11:00:06 +0000 Subject: Fix tst_QObjectBridge::connectAndDisconnect() fail Patch by Arunprasad Rajkumar on 2013-08-19 Reviewed by Allan Sandfeld Jensen. Latest version of JSC has unquoted undefined in exception messages. So replaced 'undefined' with undefined. * tests/qobjectbridge/tst_qobjectbridge.cpp: (tst_QObjectBridge::connectAndDisconnect): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154273 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: Ife6167e9f67f540fcef3f3468c37fcb85991216d Reviewed-by: Allan Sandfeld Jensen --- Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp b/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp index 94551eb8e..52e6422b1 100644 --- a/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp +++ b/Source/WebKit/qt/tests/qobjectbridge/tst_qobjectbridge.cpp @@ -1572,26 +1572,26 @@ void tst_QObjectBridge::connectAndDisconnect() QString type; QString ret = evalJS("(function() { }).connect()", type); QCOMPARE(type, sError); - QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function (evaluating '(function() { }).connect()')")); + QCOMPARE(ret, QLatin1String("TypeError: undefined is not a function (evaluating '(function() { }).connect()')")); } { QString type; QString ret = evalJS("var o = { }; o.connect = Function.prototype.connect; o.connect()", type); QCOMPARE(type, sError); - QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function (evaluating 'o.connect()')")); + QCOMPARE(ret, QLatin1String("TypeError: undefined is not a function (evaluating 'o.connect()')")); } { QString type; QString ret = evalJS("(function() { }).connect(123)", type); QCOMPARE(type, sError); - QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function (evaluating '(function() { }).connect(123)')")); + QCOMPARE(ret, QLatin1String("TypeError: undefined is not a function (evaluating '(function() { }).connect(123)')")); } { QString type; QString ret = evalJS("var o = { }; o.connect = Function.prototype.connect; o.connect(123)", type); QCOMPARE(type, sError); - QCOMPARE(ret, QLatin1String("TypeError: 'undefined' is not a function (evaluating 'o.connect(123)')")); + QCOMPARE(ret, QLatin1String("TypeError: undefined is not a function (evaluating 'o.connect(123)')")); } { -- cgit v1.2.3 From 9d69c357ca97785eee385b14942a27ec2a680ede Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Fri, 20 May 2016 13:59:05 +0300 Subject: Added missing break statement. Change-Id: I90bc4a7c65dd70206fd250dcfa81dfac02f8ba74 Reviewed-by: Allan Sandfeld Jensen --- Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp index d1a7f6cab..554ab8927 100644 --- a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp +++ b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp @@ -1179,6 +1179,7 @@ void QWebPageAdapter::triggerAction(QWebPageAdapter::MenuAction action, QWebHitT case ToggleMediaPlayPause: if (HTMLMediaElement* mediaElt = mediaElement(hitTestResult->innerNonSharedNode)) mediaElt->togglePlayState(); + break; case ToggleMediaMute: if (HTMLMediaElement* mediaElt = mediaElement(hitTestResult->innerNonSharedNode)) mediaElt->setMuted(!mediaElt->muted()); -- cgit v1.2.3 From e23e63be27e195b4f4cf46f1d947720d85e5e044 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 11 May 2016 16:14:12 +0300 Subject: Moved use_leveldb configuration from detectFeatures to sanitizeFeatures. Otherwise compilation breaks when indexed_database is disabled, because USE(LEVELDB) is always true. Change-Id: I680475baeb6796cdba859ff8daaba0c39a3e8338 Reviewed-by: Allan Sandfeld Jensen --- Tools/qmake/mkspecs/features/features.prf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index bb3432bd2..b7fb4c43b 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -173,6 +173,9 @@ defineTest(sanitizeFeatures) { # GStreamer uses Glib use?(gstreamer): WEBKIT_CONFIG += use_glib + # LevelDB is not needed without indexed_database + !enable?(indexed_database): WEBKIT_CONFIG -= use_leveldb + # VideoTrack requires video !enable?(video): WEBKIT_CONFIG -= video_track -- cgit v1.2.3 From f1b22ccfb78cc9d18d707e6d6a24a5951c60ffa5 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Thu, 21 Apr 2016 20:38:02 +0300 Subject: Disable touch_slider if touch_events is disabled. touch_events is a prerequisite for touch_slider, however, touch_slider is added to WEBKIT_CONFIG before user options processing, so it's possible to produce meaningless configuration with disabled touch_events and enabled touch_slider. It's harmless because all ENABLE(TOUCH_SLIDER) code is also guarded with ENABLE(TOUCH_EVENTS), however it still may be confusing. Change-Id: I149c798f488ec9977ea5b168c0f5d7b7c53d1aec Reviewed-by: Allan Sandfeld Jensen --- Tools/qmake/mkspecs/features/features.prf | 6 +++--- Tools/qmake/mkspecs/features/features.pri | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index b7fb4c43b..21286be2e 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -136,9 +136,6 @@ defineTest(detectFeatures) { have?(glx):have?(xcomposite):have?(xrender): WEBKIT_CONFIG += use_graphics_surface use_glx } - # Slider Touch is sensible to use when compiling WebKit2 - enable?(touch_events): WEBKIT_CONFIG += touch_slider - # IndexedDB requires leveldb enable?(indexed_database): WEBKIT_CONFIG += use_leveldb @@ -185,5 +182,8 @@ defineTest(sanitizeFeatures) { # Accelerated 2D canvas uses 3D graphics support. !use?(3d_graphics): WEBKIT_CONFIG -= accelerated_2d_canvas + # Touch slider requires touch events + !enable?(touch_events): WEBKIT_CONFIG -= touch_slider + export(WEBKIT_CONFIG) } diff --git a/Tools/qmake/mkspecs/features/features.pri b/Tools/qmake/mkspecs/features/features.pri index 1978aa081..ba18b354d 100644 --- a/Tools/qmake/mkspecs/features/features.pri +++ b/Tools/qmake/mkspecs/features/features.pri @@ -114,6 +114,7 @@ FEATURE_DEFAULTS = \ ENABLE_TOUCH_ADJUSTMENT=1 \ ENABLE_TOUCH_EVENTS=1 \ ENABLE_TOUCH_ICON_LOADING=0 \ + ENABLE_TOUCH_SLIDER=1 \ ENABLE_USER_TIMING=0 \ ENABLE_VIBRATION=0 \ ENABLE_VIDEO=0 \ -- cgit v1.2.3 From 416ad2e2a9f541e2ea27103745ec8f2b45acd54f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 23 May 2016 18:36:13 +0200 Subject: fix ios device&simulator builds again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the assumption stated in c48fd0cb is actually invalid - configure sets build_all without debug_and_release there. debug_and_release does actually imply build_all, though. to make things less confusing, don't let configure inject iphonesimulator_and_iphoneos into all projects, but handle it like debug_and_release instead. Change-Id: I05258d4a88549608c26d8b3dd9618f5736ff7ce3 Reviewed-by: Tor Arne Vestbø --- Tools/qmake/mkspecs/features/default_pre.prf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index b07481629..3e6677c92 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -102,7 +102,9 @@ gcc:isEqual(QT_ARCH, "arm"): CONFIG -= use_gold_linker # Pick up Qt's defaults for debug/release/debug_and_release if(win32|mac):!macx-xcode { - contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release build_all + contains(QT_CONFIG, simulator_and_device): CONFIG += iphonesimulator_and_iphoneos + contains(QT_CONFIG, debug_and_release): CONFIG += debug_and_release + contains(QT_CONFIG, build_all): CONFIG += build_all } FLEX = flex -- cgit v1.2.3 From da5f9d788f96340a44083ed4e28cdf6ea0a393f0 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Tue, 24 May 2016 15:25:43 +0300 Subject: Fixed drawing of zoomed border-image with repeat mode. Image::drawPattern has special optimized path for scaled transform which creates pre-scaled brush and removes scale from original transform. However this change makes following translation to (tr.x(), tr.y()) incorrect because it is expected to be done in scaled coordinate system. Change-Id: I570cf82a4e7f61f6abe3fa4cb9b39aea0e51f2e5 Task-number: QTBUG-53532 Reviewed-by: Allan Sandfeld Jensen --- Source/WebCore/platform/graphics/qt/ImageQt.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/WebCore/platform/graphics/qt/ImageQt.cpp b/Source/WebCore/platform/graphics/qt/ImageQt.cpp index 9e4408b61..f30284b90 100644 --- a/Source/WebCore/platform/graphics/qt/ImageQt.cpp +++ b/Source/WebCore/platform/graphics/qt/ImageQt.cpp @@ -156,6 +156,8 @@ void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const if (tr.x() || tr.y() || tr.width() != pixmap.width() || tr.height() != pixmap.height()) pixmap = pixmap.copy(tr); + QPoint trTopLeft = tr.topLeft(); + CompositeOperator previousOperator = ctxt->compositeOperation(); ctxt->setCompositeOperation(!pixmap.hasAlpha() && op == CompositeSourceOver ? CompositeCopy : op); @@ -180,13 +182,14 @@ void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const painter.drawPixmap(QRect(0, 0, scaledPixmap.width(), scaledPixmap.height()), pixmap); } pixmap = scaledPixmap; + trTopLeft = transform.map(trTopLeft); transform = QTransform::fromTranslate(transform.dx(), transform.dy()); } } /* Translate the coordinates as phase is not in world matrix coordinate space but the tile rect origin is. */ transform *= QTransform().translate(phase.x(), phase.y()); - transform.translate(tr.x(), tr.y()); + transform.translate(trTopLeft.x(), trTopLeft.y()); QBrush b(pixmap); b.setTransform(transform); -- cgit v1.2.3 From b889f460280ad98c89ede179bd3b9ce9cb02002b Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 30 May 2016 14:02:08 +0300 Subject: Changes for 5.6.1 Change-Id: I7836d6ed95cf3d3d989a5e3cdc2c077fc6d55d84 Reviewed-by: Allan Sandfeld Jensen --- dist/changes-5.6.1 | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 dist/changes-5.6.1 diff --git a/dist/changes-5.6.1 b/dist/changes-5.6.1 new file mode 100644 index 000000000..dd1f3fa0f --- /dev/null +++ b/dist/changes-5.6.1 @@ -0,0 +1,49 @@ +Qt 5.6.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.6.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://doc.qt.io/qt-5.6 + +The Qt version 5.6 series is binary compatible with the 5.5.x series. +Applications compiled for 5.5 will continue to run with 5.6. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + +**************************************************************************** +* Important Behavior Changes * +**************************************************************************** + + - QtWebKit will no longer support any QImageIO plugin with the Size option, + but instead only decode formats that have been whitelisted. If you are + using QtWebKit for controlled content and wish to override the white list + it can now be done with the environment variable + QTWEBKIT_IMAGEFORMAT_WHITELIST which takes a comma-separated list of + QImageIO formats. + +**************************************************************************** +* Library * +**************************************************************************** + +QtWebkit +-------- + - Fixed memory leaks and crashes related to SVG animated properties. + - Fixed compilation with libjpeg v9. + + +**************************************************************************** +* Platform Specific Changes * +**************************************************************************** + +Windows +------- +- QtWebKit does not require Qt configured with ICU support anymore to be + built. -- cgit v1.2.3 From 28077218067438fef5cdc746feb45ca6d4e755d9 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 9 Jun 2016 17:13:36 +0200 Subject: Do not warn about invalid images Null or invalid images are safe since we are not decoding them. Change-Id: I292685863a0116c25931c096ec183275c891a55d Task-number: QTBUG-53989 Reviewed-by: Konstantin Tokarev Reviewed-by: Joerg Bornemann --- Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp b/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp index 74696c23d..c93c79b1b 100644 --- a/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp +++ b/Source/WebCore/platform/graphics/qt/ImageDecoderQt.cpp @@ -93,7 +93,7 @@ void ImageDecoderQt::setData(SharedBuffer* data, bool allDataReceived) // QImageReader only allows retrieving the format before reading the image m_format = m_reader->format(); - if (!isFormatWhiteListed(m_format)) { + if (!m_format.isEmpty() && !isFormatWhiteListed(m_format)) { qWarning("Image of format '%s' blocked because it is not considered safe. If you are sure it is safe to do so, you can white-list the format by setting the environment variable QTWEBKIT_IMAGEFORMAT_WHITELIST=%s", m_format.constData(), m_format.constData()); setFailed(); m_reader.clear(); -- cgit v1.2.3