path: root/src/printsupport/kernel/qprinter.cpp
diff options
authorJohn Layt <>2014-01-28 15:05:17 +0100
committerThe Qt Project <>2014-03-17 13:46:13 +0100
commit1ffd79bfb7261268ea4b56d29122a48334a115a1 (patch)
tree122ab42a54d4c0d8db030690887d9a5bbcae8446 /src/printsupport/kernel/qprinter.cpp
parentdbc50e06df8465e6de02ac0b4458e1a3f3f8568c (diff)
QPrinter - Fix winPageSize() on Mac and Linux
Using QPageSize internally provides the Windows ID on all platforms so remove the conditional compile on the QPrinter api and add support to the print engines. Change-Id: I31e23d5090a9b6ceb087c29dead050b0ee1855a5 Reviewed-by: Lars Knoll <>
Diffstat (limited to 'src/printsupport/kernel/qprinter.cpp')
1 files changed, 0 insertions, 8 deletions
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp
index f72a0ae0fb..65dcf515b7 100644
--- a/src/printsupport/kernel/qprinter.cpp
+++ b/src/printsupport/kernel/qprinter.cpp
@@ -1882,16 +1882,12 @@ QPrintEngine *QPrinter::printEngine() const
return d->printEngine;
-#if defined (Q_OS_WIN)
\obsolete Use QPageSize::id(windowsId) and setPageLayout(QPageSize) instead.
Sets the page size to be used by the printer under Windows to \a
- \warning This function is not portable so you may prefer to use
- setPaperSize() instead.
\sa pageLayout()
void QPrinter::setWinPageSize(int pageSize)
@@ -1906,9 +1902,6 @@ void QPrinter::setWinPageSize(int pageSize)
Returns the page size used by the printer under Windows.
- \warning This function is not portable so you may prefer to use
- paperSize() instead.
\sa pageLayout()
int QPrinter::winPageSize() const
@@ -1916,7 +1909,6 @@ int QPrinter::winPageSize() const
Q_D(const QPrinter);
return d->printEngine->property(QPrintEngine::PPK_WindowsPageSize).toInt();
-#endif // Q_OS_WIN
Returns a list of the resolutions (a list of dots-per-inch