diff options
author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:05:33 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 14:02:43 +0200 |
commit | 7cbee5629604aa49c618829c8e3e55fc64e94df7 (patch) | |
tree | d12041105160c1cb21226b365edb9653d87b5853 /src/printsupport/dialogs/qabstractprintdialog_p.h | |
parent | e400b7e326c554ccd819448866265953d2a0f24d (diff) | |
parent | 5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmenu.cpp
Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308
Diffstat (limited to 'src/printsupport/dialogs/qabstractprintdialog_p.h')
-rw-r--r-- | src/printsupport/dialogs/qabstractprintdialog_p.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/printsupport/dialogs/qabstractprintdialog_p.h b/src/printsupport/dialogs/qabstractprintdialog_p.h index 12de4ee882..2537fcbf80 100644 --- a/src/printsupport/dialogs/qabstractprintdialog_p.h +++ b/src/printsupport/dialogs/qabstractprintdialog_p.h @@ -53,14 +53,12 @@ #include <QtPrintSupport/private/qtprintsupportglobal_p.h> -#ifndef QT_NO_PRINTDIALOG - #include "private/qdialog_p.h" #include "QtPrintSupport/qabstractprintdialog.h" -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(printdialog); -#ifndef QT_NO_PRINTER +QT_BEGIN_NAMESPACE class QPrinter; class QPrinterPrivate; @@ -92,10 +90,6 @@ public: int maxPage; }; -#endif //QT_NO_PRINTER - QT_END_NAMESPACE -#endif // QT_NO_PRINTDIALOG - #endif // QABSTRACTPRINTDIALOG_P_H |