diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-04 18:08:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-04 18:09:33 +0200 |
| commit | 9419dfe8ee45d08f09c09d3cbece511d721546f0 (patch) | |
| tree | 1c4584099fc1efb8de30cc4526ce7ebafe8a8ce9 /src/printsupport | |
| parent | 8b5aa7b6c40d70a7ec15b3ea485f28a142fb247c (diff) | |
| parent | 8675e1c5ee7d1209784a2320f1ae3f486b1eaae4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h
src/plugins/platforms/xcb/qxcbwindow.cpp
Change-Id: Ic747c3c50e68c005b425e7a1ec2a90965527c8bd
Diffstat (limited to 'src/printsupport')
| -rw-r--r-- | src/printsupport/kernel/qcups.cpp | 1 | ||||
| -rw-r--r-- | src/printsupport/kernel/qprintengine_win.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/printsupport/kernel/qcups.cpp b/src/printsupport/kernel/qcups.cpp index 3c6a6caffa..d655dd09ba 100644 --- a/src/printsupport/kernel/qcups.cpp +++ b/src/printsupport/kernel/qcups.cpp @@ -101,6 +101,7 @@ static inline QString jobHoldToString(const QCUPSSupport::JobHoldUntil jobHold, return localDateTime.toUTC().time().toString(QStringLiteral("HH:mm")); } // else fall through: + Q_FALLTHROUGH(); case QCUPSSupport::NoHold: return QString(); } diff --git a/src/printsupport/kernel/qprintengine_win.cpp b/src/printsupport/kernel/qprintengine_win.cpp index f1ccbaa90a..37f2290d94 100644 --- a/src/printsupport/kernel/qprintengine_win.cpp +++ b/src/printsupport/kernel/qprintengine_win.cpp @@ -106,7 +106,7 @@ static QByteArray msgBeginFailed(const char *function, const DOCINFO &d) str << ", document \"" << QString::fromWCharArray(d.lpszDocName) << '"'; if (d.lpszOutput && d.lpszOutput[0]) str << ", file \"" << QString::fromWCharArray(d.lpszOutput) << '"'; - return result.toLocal8Bit(); + return std::move(result).toLocal8Bit(); } bool QWin32PrintEngine::begin(QPaintDevice *pdev) |