summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/printsupport/dialogs/qabstractprintdialog.cpp2
-rw-r--r--src/printsupport/doc/src/qtprintsupport-index.qdoc (renamed from src/printsupport/doc/src/printing.qdoc)19
-rw-r--r--src/printsupport/doc/src/qtprintsupport-module.qdoc (renamed from src/printsupport/doc/src/qtprintsupport.qdoc)8
-rw-r--r--src/printsupport/kernel/qprinter.cpp4
4 files changed, 16 insertions, 17 deletions
diff --git a/src/printsupport/dialogs/qabstractprintdialog.cpp b/src/printsupport/dialogs/qabstractprintdialog.cpp
index 898e0f4b69..009de28909 100644
--- a/src/printsupport/dialogs/qabstractprintdialog.cpp
+++ b/src/printsupport/dialogs/qabstractprintdialog.cpp
@@ -66,7 +66,7 @@ class QPrintDialogPrivate : public QAbstractPrintDialogPrivate
customize settings shown in print dialogs, but it is not used directly.
Use QPrintDialog to display a print dialog in your application.
- \sa QPrintDialog, QPrinter, {Printing with Qt}
+ \sa QPrintDialog, QPrinter
*/
/*!
diff --git a/src/printsupport/doc/src/printing.qdoc b/src/printsupport/doc/src/qtprintsupport-index.qdoc
index d461672566..414ad570d8 100644
--- a/src/printsupport/doc/src/printing.qdoc
+++ b/src/printsupport/doc/src/qtprintsupport-index.qdoc
@@ -26,16 +26,8 @@
****************************************************************************/
/*!
- \group printing
- \title Printer and Printing APIs
- \brief Classes for producing printed output
- \ingroup groups
-*/
-
-
-/*!
- \page printing.html
- \title Printing with Qt
+ \page qtprintsupport-index.html
+ \title Qt Print Support
\ingroup qt-graphics
\brief A guide to producing printed output with Qt's paint system and widgets.
@@ -185,3 +177,10 @@
(including logos) in conjunction with PDF; e.g. "Adobe PDF". Please refer
to \l{http://www.adobe.com}{www.adobe.com} for guidelines.
*/
+
+/*!
+ \group printing
+ \title Printer and Printing APIs
+ \brief Classes for producing printed output
+ \ingroup groups
+*/
diff --git a/src/printsupport/doc/src/qtprintsupport.qdoc b/src/printsupport/doc/src/qtprintsupport-module.qdoc
index c82c30896d..68044114fc 100644
--- a/src/printsupport/doc/src/qtprintsupport.qdoc
+++ b/src/printsupport/doc/src/qtprintsupport-module.qdoc
@@ -27,11 +27,11 @@
/*!
\module QtPrintSupport
- \title QtPrintSupport Module
- \ingroup modules
+ \title Qt Print Support Module
+ \brief The Qt PrintSupport module provides classes to make printing easier and portable.
- \brief The QtPrintSupport module provides classes to make printing
- easier and portable.
+ \ingroup modules
+ \ingroup technology-apis
To include the definitions of the module's classes, use the
following directive:
diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp
index bc8ce5f1cb..dcb09aa93c 100644
--- a/src/printsupport/kernel/qprinter.cpp
+++ b/src/printsupport/kernel/qprinter.cpp
@@ -268,7 +268,7 @@ void QPrinterPrivate::addToManualSetList(QPrintEngine::PrintEnginePropertyKey ke
extend printing support to cover new types of printing subsystem by
subclassing QPrintEngine and reimplementing its interface.
- \sa QPrintDialog, {Printing with Qt}
+ \sa QPrintDialog, {Qt Print Support}
*/
/*!
@@ -1263,7 +1263,7 @@ void QPrinter::setCollateCopies(bool collate)
printer's margins, so the application must account for the margins
itself.
- \sa fullPage(), setPaperSize(), width(), height(), {Printing with Qt}
+ \sa fullPage(), setPaperSize(), width(), height()
*/
void QPrinter::setFullPage(bool fp)