diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-06 10:45:40 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-06 10:54:01 +0200 |
| commit | 77da617dc8e378a631ee8c15b1b414f16b87f147 (patch) | |
| tree | 563f4f8e64e416774ea2b1599b896b589385168c /src/printsupport/kernel/qprinter.cpp | |
| parent | c17134e2db4d364855aa78a0d3c47cb9ef964dd9 (diff) | |
| parent | 01f3530650f9f6f4c08520263a3c62281d81e3fc (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
doc/global/qt-cpp-defines.qdocconf
src/3rdparty/forkfd/forkfd.c
src/corelib/codecs/qtextcodec.cpp
src/corelib/kernel/qmetatype.cpp
src/corelib/tools/qset.qdoc
src/gui/accessible/qaccessible.cpp
src/gui/image/qpixmapcache.cpp
src/opengl/qgl.cpp
src/tools/qdoc/generator.cpp
src/widgets/kernel/qwidget.cpp
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085
Diffstat (limited to 'src/printsupport/kernel/qprinter.cpp')
| -rw-r--r-- | src/printsupport/kernel/qprinter.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 4f8eaba85a..2cecf61573 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -1092,12 +1092,20 @@ void QPrinter::setCreator(const QString &creator) To obtain the current page margins use pageLayout().pageMargins(). - Returns true if the page margins was successfully set to \a margins. + Returns \c true if the page margins was successfully set to \a margins. \sa pageLayout(), setPageLayout() */ /*! + \fn bool QPrinter::setPageMargins(const QMarginsF &margins) + + Set the page margins to \a margins using the current units. + Returns \c true if the page margins were set successfully. + + \sa pageLayout(), setPageLayout() +*/ +/*! \fn QPageLayout QPrinter::pageLayout() const \since 5.3 |