diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-28 11:20:40 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-03-28 11:20:40 +0000 |
commit | 71a2d4fa3d9e1293b436957fd615908e685153eb (patch) | |
tree | 5d3b146425133bd6dac43e05b3267b4d7e3607c0 /src/printsupport | |
parent | 6c32927f8cf226b8158dd25f4b92a6853dadb8b6 (diff) | |
parent | b48a13fd6843e12b5725aa3ff0d010007e7c43b4 (diff) |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'src/printsupport')
-rw-r--r-- | src/printsupport/configure.json | 3 | ||||
-rw-r--r-- | src/printsupport/dialogs/qabstractprintdialog.h | 11 | ||||
-rw-r--r-- | src/printsupport/dialogs/qabstractprintdialog_p.h | 2 | ||||
-rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog.h | 9 | ||||
-rw-r--r-- | src/printsupport/dialogs/qpagesetupdialog_p.h | 3 | ||||
-rw-r--r-- | src/printsupport/dialogs/qprintdialog.h | 9 | ||||
-rw-r--r-- | src/printsupport/dialogs/qprintpreviewdialog.cpp | 3 | ||||
-rw-r--r-- | src/printsupport/dialogs/qprintpreviewdialog.h | 3 |
8 files changed, 24 insertions, 19 deletions
diff --git a/src/printsupport/configure.json b/src/printsupport/configure.json index 93d345840f..8d2a633481 100644 --- a/src/printsupport/configure.json +++ b/src/printsupport/configure.json @@ -48,7 +48,7 @@ "label": "QPrinter", "purpose": "Provides a printer backend of QPainter.", "section": "Painting", - "condition": "!config.android && !config.uikit && !config.winrt && features.picture && features.temporaryfile && features.pdf", + "condition": "!config.uikit && !config.winrt && features.picture && features.temporaryfile && features.pdf", "output": [ "publicFeature", "feature" ] }, "printpreviewwidget": { @@ -66,6 +66,7 @@ "features.buttongroup", "features.checkbox", "features.combobox", + "features.dialog", "features.datetimeedit", "features.dialogbuttonbox", "features.printer", diff --git a/src/printsupport/dialogs/qabstractprintdialog.h b/src/printsupport/dialogs/qabstractprintdialog.h index 6c57a301a6..e6d34cdb5b 100644 --- a/src/printsupport/dialogs/qabstractprintdialog.h +++ b/src/printsupport/dialogs/qabstractprintdialog.h @@ -41,13 +41,14 @@ #define QABSTRACTPRINTDIALOG_H #include <QtPrintSupport/qtprintsupportglobal.h> + +#if QT_CONFIG(printdialog) + #include <QtWidgets/qdialog.h> QT_BEGIN_NAMESPACE -#ifndef QT_NO_PRINTER - class QAbstractPrintDialogPrivate; class QPrinter; @@ -81,7 +82,6 @@ public: Q_DECLARE_FLAGS(PrintDialogOptions, PrintDialogOption) Q_FLAG(PrintDialogOptions) -#ifndef QT_NO_PRINTDIALOG explicit QAbstractPrintDialog(QPrinter *printer, QWidget *parent = Q_NULLPTR); ~QAbstractPrintDialog(); @@ -114,13 +114,12 @@ protected: private: Q_DISABLE_COPY(QAbstractPrintDialog) -#endif // QT_NO_PRINTDIALOG }; Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstractPrintDialog::PrintDialogOptions) -#endif // QT_NO_PRINTER - QT_END_NAMESPACE +#endif // QT_NO_PRINTDIALOG + #endif // QABSTRACTPRINTDIALOG_H diff --git a/src/printsupport/dialogs/qabstractprintdialog_p.h b/src/printsupport/dialogs/qabstractprintdialog_p.h index fe4e18cfc3..12de4ee882 100644 --- a/src/printsupport/dialogs/qabstractprintdialog_p.h +++ b/src/printsupport/dialogs/qabstractprintdialog_p.h @@ -52,10 +52,10 @@ // #include <QtPrintSupport/private/qtprintsupportglobal_p.h> -#include "private/qdialog_p.h" #ifndef QT_NO_PRINTDIALOG +#include "private/qdialog_p.h" #include "QtPrintSupport/qabstractprintdialog.h" QT_BEGIN_NAMESPACE diff --git a/src/printsupport/dialogs/qpagesetupdialog.h b/src/printsupport/dialogs/qpagesetupdialog.h index 124d215700..bc7462ebaa 100644 --- a/src/printsupport/dialogs/qpagesetupdialog.h +++ b/src/printsupport/dialogs/qpagesetupdialog.h @@ -41,13 +41,14 @@ #define QPAGESETUPDIALOG_H #include <QtPrintSupport/qtprintsupportglobal.h> + +#ifndef QT_NO_PRINTDIALOG + #include <QtWidgets/qdialog.h> QT_BEGIN_NAMESPACE -#ifndef QT_NO_PRINTDIALOG - class QPrinter; class QPageSetupDialogPrivate; @@ -74,8 +75,8 @@ public: QPrinter *printer(); }; -#endif // QT_NO_PRINTDIALOG - QT_END_NAMESPACE +#endif // QT_NO_PRINTDIALOG + #endif // QPAGESETUPDIALOG_H diff --git a/src/printsupport/dialogs/qpagesetupdialog_p.h b/src/printsupport/dialogs/qpagesetupdialog_p.h index 46e178fef9..98b466ccdc 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_p.h +++ b/src/printsupport/dialogs/qpagesetupdialog_p.h @@ -53,10 +53,11 @@ // #include <QtPrintSupport/private/qtprintsupportglobal_p.h> -#include "private/qdialog_p.h" #ifndef QT_NO_PRINTDIALOG +#include "private/qdialog_p.h" + #include "qbytearray.h" #include "qpagesetupdialog.h" #include "qpointer.h" diff --git a/src/printsupport/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h index f01e515af4..35d650a7fc 100644 --- a/src/printsupport/dialogs/qprintdialog.h +++ b/src/printsupport/dialogs/qprintdialog.h @@ -41,13 +41,14 @@ #define QPRINTDIALOG_H #include <QtPrintSupport/qtprintsupportglobal.h> + +#ifndef QT_NO_PRINTDIALOG + #include <QtPrintSupport/qabstractprintdialog.h> QT_BEGIN_NAMESPACE -#ifndef QT_NO_PRINTDIALOG - class QPrintDialogPrivate; class QPushButton; class QPrinter; @@ -101,8 +102,8 @@ private: # endif // Q_OS_UNIX }; -#endif // QT_NO_PRINTDIALOG - QT_END_NAMESPACE +#endif // QT_NO_PRINTDIALOG + #endif // QPRINTDIALOG_H diff --git a/src/printsupport/dialogs/qprintpreviewdialog.cpp b/src/printsupport/dialogs/qprintpreviewdialog.cpp index 4bed0b6454..33ba842a1f 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.cpp +++ b/src/printsupport/dialogs/qprintpreviewdialog.cpp @@ -40,7 +40,6 @@ #include "qprintpreviewdialog.h" #include "qprintpreviewwidget.h" #include <private/qprinter_p.h> -#include "private/qdialog_p.h" #include "qprintdialog.h" #include <QtWidgets/qaction.h> @@ -59,6 +58,8 @@ #ifndef QT_NO_PRINTPREVIEWDIALOG +#include "private/qdialog_p.h" + #include <QtWidgets/qformlayout.h> #include <QtWidgets/qlabel.h> diff --git a/src/printsupport/dialogs/qprintpreviewdialog.h b/src/printsupport/dialogs/qprintpreviewdialog.h index 903083167c..640369fdf3 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.h +++ b/src/printsupport/dialogs/qprintpreviewdialog.h @@ -41,10 +41,11 @@ #define QPRINTPREVIEWDIALOG_H #include <QtPrintSupport/qtprintsupportglobal.h> -#include <QtWidgets/qdialog.h> #ifndef QT_NO_PRINTPREVIEWDIALOG +#include <QtWidgets/qdialog.h> + QT_BEGIN_NAMESPACE |