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

Conflicts:
	tests/auto/corelib/io/qfile/tst_qfile.cpp
	tests/auto/corelib/io/qprocess/tst_qprocess.cpp
	tests/auto/corelib/tools/qversionnumber/qversionnumber.pro

Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e

4 files changed, 25 insertions, 16 deletions

diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp
index a15fd51c98..9633032a0f 100644
--- a/src/printsupport/dialogs/qprintdialog_unix.cpp
+++ b/src/printsupport/dialogs/qprintdialog_unix.cpp
@@ -806,7 +806,7 @@ void QUnixPrintWidgetPrivate::applyPrinterProperties()
             home += QLatin1Char('/');
         if (!cur.isEmpty() && cur.at(cur.length()-1) != QLatin1Char('/'))
             cur += QLatin1Char('/');
-        if (cur.left(home.length()) != home)
+        if (!cur.startsWith(home))
             cur = home;
         if (QGuiApplication::platformName() == QLatin1String("xcb")) {
             if (printer->docName().isEmpty()) {
diff --git a/src/printsupport/doc/qtprintsupport.qdocconf b/src/printsupport/doc/qtprintsupport.qdocconf
index 2ec33f6600..fbb6f8d1a9 100644
--- a/src/printsupport/doc/qtprintsupport.qdocconf
+++ b/src/printsupport/doc/qtprintsupport.qdocconf
@@ -26,7 +26,7 @@ qhp.QtPrintSupport.subprojects.classes.sortPages = true
 
 tagfile                 = ../../../doc/qtprintsupport/qtprintsupport.tags
 
-depends                 += qtcore qtgui qtwidgets qtdoc
+depends                 += qtcore qtgui qtwidgets qtdoc qmake
 
 headerdirs  += ..
 
diff --git a/src/printsupport/kernel/qpaintengine_alpha.cpp b/src/printsupport/kernel/qpaintengine_alpha.cpp
index 0ae9464b69..79026e5762 100644
--- a/src/printsupport/kernel/qpaintengine_alpha.cpp
+++ b/src/printsupport/kernel/qpaintengine_alpha.cpp
@@ -146,8 +146,16 @@ void QAlphaPaintEngine::updateState(const QPaintEngineState &state)
 
     d->m_hasalpha = d->m_alphaOpacity || d->m_alphaBrush || d->m_alphaPen;
 
-    if (d->m_picengine)
+    if (d->m_picengine) {
+        const QPainter *p = painter();
+        d->m_picpainter->setPen(p->pen());
+        d->m_picpainter->setBrush(p->brush());
+        d->m_picpainter->setBrushOrigin(p->brushOrigin());
+        d->m_picpainter->setFont(p->font());
+        d->m_picpainter->setOpacity(p->opacity());
+        d->m_picpainter->setTransform(p->combinedTransform());
         d->m_picengine->updateState(state);
+    }
 }
 
 void QAlphaPaintEngine::drawPath(const QPainterPath &path)
diff --git a/src/printsupport/kernel/qprintengine_win.cpp b/src/printsupport/kernel/qprintengine_win.cpp
index b377401ed9..c8ce2e482d 100644
--- a/src/printsupport/kernel/qprintengine_win.cpp
+++ b/src/printsupport/kernel/qprintengine_win.cpp
@@ -93,9 +93,10 @@ static QByteArray msgBeginFailed(const char *function, const DOCINFO &d)
 {
     QString result;
     QTextStream str(&result);
-    str << "QWin32PrintEngine::begin: " << function << " failed, document \""
-        << QString::fromWCharArray(d.lpszDocName) << '"';
-    if (d.lpszOutput[0])
+    str << "QWin32PrintEngine::begin: " << function << " failed";
+    if (d.lpszDocName && d.lpszDocName[0])
+       str << ", document \"" << QString::fromWCharArray(d.lpszDocName) << '"';
+    if (d.lpszOutput && d.lpszOutput[0])
         str << ", file \"" << QString::fromWCharArray(d.lpszOutput) << '"';
     return result.toLocal8Bit();
 }
@@ -1149,7 +1150,7 @@ void QWin32PrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &
         d->updateMetrics();
         d->doReinit();
 #ifdef QT_DEBUG_METRICS
-        qDebug() << "QWin32PrintEngine::setProperty(PPK_Orientation," << orientation << ")";
+        qDebug() << "QWin32PrintEngine::setProperty(PPK_Orientation," << orientation << ')';
         d->debugMetrics();
 #endif // QT_DEBUG_METRICS
         break;
@@ -1172,7 +1173,7 @@ void QWin32PrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &
             d->setPageSize(pageSize);
             d->doReinit();
 #ifdef QT_DEBUG_METRICS
-            qDebug() << "QWin32PrintEngine::setProperty(PPK_PageSize," << value.toInt() << ")";
+            qDebug() << "QWin32PrintEngine::setProperty(PPK_PageSize," << value.toInt() << ')';
             d->debugMetrics();
 #endif // QT_DEBUG_METRICS
         }
@@ -1188,7 +1189,7 @@ void QWin32PrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &
             d->setPageSize(pageSize);
             d->doReinit();
 #ifdef QT_DEBUG_METRICS
-            qDebug() << "QWin32PrintEngine::setProperty(PPK_PaperName," << value.toString() << ")";
+            qDebug() << "QWin32PrintEngine::setProperty(PPK_PaperName," << value.toString() << ')';
             d->debugMetrics();
 #endif // QT_DEBUG_METRICS
         }
@@ -1227,7 +1228,7 @@ void QWin32PrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &
         d->stretch_y = d->dpi_y / double(d->resolution);
         d->updateMetrics();
 #ifdef QT_DEBUG_METRICS
-        qDebug() << "QWin32PrintEngine::setProperty(PPK_Resolution," << value.toInt() << ")";
+        qDebug() << "QWin32PrintEngine::setProperty(PPK_Resolution," << value.toInt() << ')';
         d->debugMetrics();
 #endif // QT_DEBUG_METRICS
         break;
@@ -1241,7 +1242,7 @@ void QWin32PrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &
             d->setPageSize(pageSize);
             d->doReinit();
 #ifdef QT_DEBUG_METRICS
-            qDebug() << "QWin32PrintEngine::setProperty(PPK_WindowsPageSize," << value.toInt() << ")";
+            qDebug() << "QWin32PrintEngine::setProperty(PPK_WindowsPageSize," << value.toInt() << ')';
             d->debugMetrics();
 #endif // QT_DEBUG_METRICS
             break;
@@ -1257,7 +1258,7 @@ void QWin32PrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &
             d->setPageSize(pageSize);
             d->doReinit();
 #ifdef QT_DEBUG_METRICS
-            qDebug() << "QWin32PrintEngine::setProperty(PPK_CustomPaperSize," << value.toSizeF() << ")";
+            qDebug() << "QWin32PrintEngine::setProperty(PPK_CustomPaperSize," << value.toSizeF() << ')';
             d->debugMetrics();
 #endif // QT_DEBUG_METRICS
         }
@@ -1272,7 +1273,7 @@ void QWin32PrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &
                                              margins.at(2).toReal(), margins.at(3).toReal()));
         d->updateMetrics();
 #ifdef QT_DEBUG_METRICS
-        qDebug() << "QWin32PrintEngine::setProperty(PPK_PageMargins," << margins << ")";
+        qDebug() << "QWin32PrintEngine::setProperty(PPK_PageMargins," << margins << ')';
         d->debugMetrics();
 #endif // QT_DEBUG_METRICS
         break;
@@ -1287,7 +1288,7 @@ void QWin32PrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &
             d->setPageSize(pageSize);
             d->doReinit();
 #ifdef QT_DEBUG_METRICS
-            qDebug() << "QWin32PrintEngine::setProperty(PPK_QPageSize," << pageSize << ")";
+            qDebug() << "QWin32PrintEngine::setProperty(PPK_QPageSize," << pageSize << ')';
             d->debugMetrics();
 #endif // QT_DEBUG_METRICS
         }
@@ -1300,7 +1301,7 @@ void QWin32PrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &
         d->m_pageLayout.setMargins(pair.first);
         d->updateMetrics();
 #ifdef QT_DEBUG_METRICS
-        qDebug() << "QWin32PrintEngine::setProperty(PPK_QPageMargins," << pair.first << pair.second << ")";
+        qDebug() << "QWin32PrintEngine::setProperty(PPK_QPageMargins," << pair.first << pair.second << ')';
         d->debugMetrics();
 #endif // QT_DEBUG_METRICS
         break;
@@ -1316,7 +1317,7 @@ void QWin32PrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &
             d->m_pageLayout.setMargins(pageLayout.margins());
             d->updateMetrics();
 #ifdef QT_DEBUG_METRICS
-            qDebug() << "QWin32PrintEngine::setProperty(PPK_QPageLayout," << pageLayout << ")";
+            qDebug() << "QWin32PrintEngine::setProperty(PPK_QPageLayout," << pageLayout << ')';
             d->debugMetrics();
 #endif // QT_DEBUG_METRICS
         }