Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	mkspecs/features/qml_module.prf
	mkspecs/features/qt_common.prf
	src/gui/text/qzip.cpp
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/platforms/windows/array.h
	src/testlib/qtestcase.cpp
	src/widgets/dialogs/qfilesystemmodel.h

Change-Id: Ie41c5868415b81f7693c80e045497035504bb210

5 files changed, 101 insertions, 1 deletions

diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
index 8777cc6e11..bec098d462 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/manual.pro
@@ -31,6 +31,7 @@ qsysinfo \
 qtabletevent \
 qtexteditlist \
 qtbug-8933 \
+qtbug-52641 \
 qtouchevent \
 touch \
 qwidget_zorder \
diff --git a/tests/manual/qtabletevent/device_information/tabletwidget.cpp b/tests/manual/qtabletevent/device_information/tabletwidget.cpp
index a30e32b6d9..b4273bde8e 100644
--- a/tests/manual/qtabletevent/device_information/tabletwidget.cpp
+++ b/tests/manual/qtabletevent/device_information/tabletwidget.cpp
@@ -33,7 +33,7 @@
 #include <QMetaObject>
 #include <QMetaEnum>
 
-TabletWidget::TabletWidget(bool mouseToo) : mMouseToo(mouseToo)
+TabletWidget::TabletWidget(bool mouseToo) : mMouseToo(mouseToo), mWheelEventCount(0)
 {
     QPalette newPalette = palette();
     newPalette.setColor(QPalette::Window, Qt::white);
@@ -82,6 +82,10 @@ bool TabletWidget::eventFilter(QObject *, QEvent *ev)
             mGPos = event->globalPos();
             mTimestamp = event->timestamp();
         }
+        break;
+    case QEvent::Wheel:
+        ++mWheelEventCount;
+        break;
     default:
         break;
     }
@@ -176,6 +180,8 @@ void TabletWidget::paintEvent(QPaintEvent *)
         eventInfo << QString("z: %1").arg(QString::number(mZ));
 
         eventInfo << QString("Unique Id: %1").arg(QString::number(mUnique));
+
+        eventInfo << QString("Total wheel events: %1").arg(QString::number(mWheelEventCount));
     }
 
     QString text = eventInfo.join("\n");
diff --git a/tests/manual/qtabletevent/device_information/tabletwidget.h b/tests/manual/qtabletevent/device_information/tabletwidget.h
index 4e6520e4cc..2b014a213a 100644
--- a/tests/manual/qtabletevent/device_information/tabletwidget.h
+++ b/tests/manual/qtabletevent/device_information/tabletwidget.h
@@ -61,6 +61,7 @@ private:
     qint64 mUnique;
     bool mMouseToo;
     ulong mTimestamp;
+    int mWheelEventCount;
 };
 
 #endif // TABLETWIDGET_H
diff --git a/tests/manual/qtbug-52641/main.cpp b/tests/manual/qtbug-52641/main.cpp
new file mode 100644
index 0000000000..33ebd8584c
--- /dev/null
+++ b/tests/manual/qtbug-52641/main.cpp
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 Kai Pastor
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QFileDialog>
+#include <QPainter>
+#include <QPdfWriter>
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+
+    QString filepath = QFileDialog::getSaveFileName(nullptr, "Save File", "",
+                                                    "PDF files (*.pdf)");
+    if (filepath.isEmpty())
+        return 1;
+    QPdfWriter writer(filepath);
+    writer.setPageSize(QPageSize(QPageSize::A4));
+    writer.setResolution(300);
+
+    QPainterPath path;
+    path.moveTo(0,0);
+    path.lineTo(1000,0);
+    path.lineTo(1000,1000);
+    path.lineTo(0,800);
+    path.lineTo(500,100);
+    path.lineTo(800,900);
+    path.lineTo(300,600);
+
+    QPen pen;
+    pen.setWidth(30);
+    pen.setJoinStyle(Qt::MiterJoin);
+
+    // The black path on the first page must always be visible in the PDF viewer.
+    QPainter p(&writer);
+    pen.setMiterLimit(6.0);
+    p.setPen(pen);
+    p.drawPath(path);
+
+    // If a miter limit below 1.0 is written to the PDF,
+    // broken PDF viewers may not show the red path on the second page.
+    writer.newPage();
+    pen.setMiterLimit(0.6);
+    pen.setColor(Qt::red);
+    p.setPen(pen);
+    p.drawPath(path);
+
+    p.end();
+    return 0;
+}
diff --git a/tests/manual/qtbug-52641/qtbug-52641.pro b/tests/manual/qtbug-52641/qtbug-52641.pro
new file mode 100644
index 0000000000..5a9ff6df52
--- /dev/null
+++ b/tests/manual/qtbug-52641/qtbug-52641.pro
@@ -0,0 +1,5 @@
+TARGET   = qtbug-52641
+TEMPLATE = app
+QT       = core gui widgets
+SOURCES  = main.cpp
+