diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-10-09 17:56:52 +0200 |
| commit | 881ceeff428c377d02ae3881beccdbb028385075 (patch) | |
| tree | 65bd4335d7f67b81b04e33f2cbb17a41cf966dd8 /src/printsupport | |
| parent | b3d2c867ed14cd6337d5e32b8750f198b5b7d331 (diff) | |
| parent | 106487387d493dab934e19b33bfed55b8df62d67 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14
Diffstat (limited to 'src/printsupport')
| -rw-r--r-- | src/printsupport/kernel/qprint_p.h | 4 | ||||
| -rw-r--r-- | src/printsupport/kernel/qprintengine_win.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/printsupport/kernel/qprint_p.h b/src/printsupport/kernel/qprint_p.h index c674290d16..504a0d6e20 100644 --- a/src/printsupport/kernel/qprint_p.h +++ b/src/printsupport/kernel/qprint_p.h @@ -277,9 +277,9 @@ public: static QPrint::DuplexMode ppdChoiceToDuplexMode(const QByteArray &choice) { - if (choice == QByteArrayLiteral("DuplexTumble")) + if (choice == "DuplexTumble") return QPrint::DuplexShortSide; - else if (choice == QByteArrayLiteral("DuplexNoTumble")) + else if (choice == "DuplexNoTumble") return QPrint::DuplexLongSide; else // None or SimplexTumble or SimplexNoTumble return QPrint::DuplexNone; diff --git a/src/printsupport/kernel/qprintengine_win.cpp b/src/printsupport/kernel/qprintengine_win.cpp index 2f8d8f0a38..14ffcaca96 100644 --- a/src/printsupport/kernel/qprintengine_win.cpp +++ b/src/printsupport/kernel/qprintengine_win.cpp @@ -1414,6 +1414,9 @@ QVariant QWin32PrintEngine::property(PrintEnginePropertyKey key) const value.setValue(d->m_pageLayout); break; + case PPK_CustomBase: + break; + // No default so that compiler will complain if new keys added and not handled in this engine } return value; |