diff options
| -rw-r--r-- | src/printsupport/kernel/qprintengine_win.cpp | 6 | ||||
| -rw-r--r-- | src/printsupport/kernel/qprinter.cpp | 2 | ||||
| -rw-r--r-- | src/printsupport/kernel/qprinter.h | 6 |
3 files changed, 4 insertions, 10 deletions
diff --git a/src/printsupport/kernel/qprintengine_win.cpp b/src/printsupport/kernel/qprintengine_win.cpp index 958e4a0989..da328418b7 100644 --- a/src/printsupport/kernel/qprintengine_win.cpp +++ b/src/printsupport/kernel/qprintengine_win.cpp @@ -182,7 +182,7 @@ static const struct { int winSourceName; QPrinter::PaperSource qtSourceName; } sources[] = { - { DMBIN_ONLYONE, QPrinter::OnlyOne }, + { DMBIN_UPPER, QPrinter::Upper }, // = DBMIN_ONLYONE { DMBIN_LOWER, QPrinter::Lower }, { DMBIN_MIDDLE, QPrinter::Middle }, { DMBIN_MANUAL, QPrinter::Manual }, @@ -195,9 +195,7 @@ static const struct { { DMBIN_LARGECAPACITY, QPrinter::LargeCapacity }, { DMBIN_CASSETTE, QPrinter::Cassette }, { DMBIN_FORMSOURCE, QPrinter::FormSource }, - { DMBIN_FIRST, QPrinter::First }, - { DMBIN_LAST, QPrinter::Last }, - { DMBIN_UPPER, QPrinter::Upper }, + { DMBIN_USER, QPrinter::CustomSource }, { 0, (QPrinter::PaperSource) -1 } }; diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 366e3bc844..86985fa7ca 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -521,8 +521,6 @@ void QPrinterPrivate::setProperty(QPrintEngine::PrintEnginePropertyKey key, cons \value OnlyOne \value Tractor \value SmallFormat - \value First - \value Last \value Upper \value CustomSource A PaperSource defined by the printer that is unknown to Qt \value LastPaperSource The highest valid PaperSource value, currently CustomSource diff --git a/src/printsupport/kernel/qprinter.h b/src/printsupport/kernel/qprinter.h index 54047c0c32..679f3af043 100644 --- a/src/printsupport/kernel/qprinter.h +++ b/src/printsupport/kernel/qprinter.h @@ -104,11 +104,9 @@ public: Cassette, FormSource, MaxPageSource, // Deprecated - First, - Last, - Upper, CustomSource, - LastPaperSource = CustomSource + LastPaperSource = CustomSource, + Upper = OnlyOne // As defined in Windows }; enum PrinterState { Idle, |