From 28010af899d96024c7336363687873144f4f2a82 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Sat, 6 Aug 2016 19:25:36 +0300 Subject: Dashed and dotted borders having radius have overlong dash lengths WebKit assumes FlatCap as default, while Qt uses SquareCap. In case of dotted borders, they are rendered as solid, because gaps are completely filled by dash caps. Task-number: QTBUG-55171 QTBUG-55175 Change-Id: Ie18f3c9b9a92db55aa716792316d9b0e9263f223 Reviewed-by: Allan Sandfeld Jensen --- Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp index 65b93535a..b11e05d8b 100644 --- a/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp +++ b/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp @@ -356,6 +356,7 @@ void GraphicsContext::platformInit(PlatformGraphicsContext* painter) QPen pen(painter->pen()); pen.setColor(strokeColor()); pen.setJoinStyle(toQtLineJoin(MiterJoin)); + pen.setCapStyle(Qt::FlatCap); painter->setPen(pen); } -- cgit v1.2.1 From bad5ece677263b1fd025ae2305896abbcb0b94a6 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 12 Aug 2016 11:07:24 +0200 Subject: Doc: Change instances of 'OS X' to 'macOS' As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase). Change-Id: I47a83c520dc57f77666d8a40de30d3bb9fd724f9 Reviewed-by: Konstantin Tokarev Reviewed-by: Leena Miettinen --- Source/WebKit/qt/docs/qtwebkit.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/WebKit/qt/docs/qtwebkit.qdoc b/Source/WebKit/qt/docs/qtwebkit.qdoc index f8f22fbd9..f72d39a32 100644 --- a/Source/WebKit/qt/docs/qtwebkit.qdoc +++ b/Source/WebKit/qt/docs/qtwebkit.qdoc @@ -175,7 +175,7 @@ \endtable \table - \header \li Mac OS X + \header \li \macos \row \li \list \li \c{Library/Internet Plug-Ins} in the user's home directory -- cgit v1.2.1 From bb43bca1664721401c3a2c25b585913bb5e8cb4f Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 22 Aug 2016 10:02:51 +0200 Subject: Prospective build fix for Windows Similar to commit 770a0c91f3fadcdb132d9eb96d085aafbe1bacd0 in qtbase we may need a heuristic for the COPIES assignment for the qmldir file to protect against copying the same file twice to the same location on debug-and-release builds on Windows. Change-Id: I60d34d218856a70c242824b9253d229d2d33d48d Reviewed-by: Oswald Buddenhagen --- Source/WebKit/qt/declarative/experimental/experimental.pri | 8 +++++--- Source/WebKit/qt/declarative/public.pri | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Source/WebKit/qt/declarative/experimental/experimental.pri b/Source/WebKit/qt/declarative/experimental/experimental.pri index c59f4569e..c4d7002e4 100644 --- a/Source/WebKit/qt/declarative/experimental/experimental.pri +++ b/Source/WebKit/qt/declarative/experimental/experimental.pri @@ -11,9 +11,11 @@ TARGET.module_name = QtWebKit/experimental CONFIG += plugin -cpqmldir.files = $${_PRO_FILE_PWD_}/qmldir -cpqmldir.path = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name} -COPIES += cpqmldir +!debug_and_release|!build_all|CONFIG(release, debug|release) { + cpqmldir.files = $${_PRO_FILE_PWD_}/qmldir + cpqmldir.path = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name} + COPIES += cpqmldir +} contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols diff --git a/Source/WebKit/qt/declarative/public.pri b/Source/WebKit/qt/declarative/public.pri index bdef38045..3c7d07a05 100644 --- a/Source/WebKit/qt/declarative/public.pri +++ b/Source/WebKit/qt/declarative/public.pri @@ -11,9 +11,11 @@ TARGET.module_name = QtWebKit CONFIG += plugin -cpqmldir.files = $${_PRO_FILE_PWD_}/qmldir -cpqmldir.path = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name} -COPIES += cpqmldir +!debug_and_release|!build_all|CONFIG(release, debug|release) { + cpqmldir.files = $${_PRO_FILE_PWD_}/qmldir + cpqmldir.path = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name} + COPIES += cpqmldir +} contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols -- cgit v1.2.1