diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-08-25 14:31:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-08-25 14:31:20 +0200 |
| commit | 01676ca2ffb25adfe331a3b50792ac99687d5319 (patch) | |
| tree | b8f792ae21666ed4f813a8fff7a0911a04e4c8da | |
| parent | d9ca6bcb08d9560e91a1ca1fe4542c26791b26c1 (diff) | |
| parent | bb43bca1664721401c3a2c25b585913bb5e8cb4f (diff) | |
| download | qtwebkit-01676ca2ffb25adfe331a3b50792ac99687d5319.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I012e290914d5ea3030c54c730914204e0f4a8b0b
4 files changed, 12 insertions, 7 deletions
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); } 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 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 |