diff options
-rw-r--r-- | src/printsupport/dialogs/dialogs.pri | 11 | ||||
-rw-r--r-- | src/printsupport/dialogs/qprintpreviewdialog.cpp | 6 | ||||
-rw-r--r-- | src/printsupport/dialogs/qprintpreviewdialog.h | 7 |
3 files changed, 9 insertions, 15 deletions
diff --git a/src/printsupport/dialogs/dialogs.pri b/src/printsupport/dialogs/dialogs.pri index 7b520a05de..6c75e562ab 100644 --- a/src/printsupport/dialogs/dialogs.pri +++ b/src/printsupport/dialogs/dialogs.pri @@ -5,8 +5,7 @@ HEADERS += \ dialogs/qabstractprintdialog_p.h \ dialogs/qpagesetupdialog_p.h \ dialogs/qpagesetupdialog.h \ - dialogs/qprintdialog.h \ - dialogs/qprintpreviewdialog.h + dialogs/qprintdialog.h osx { OBJECTIVE_SOURCES += dialogs/qpagesetupdialog_mac.mm \ @@ -33,8 +32,12 @@ INCLUDEPATH += $$PWD SOURCES += \ dialogs/qabstractprintdialog.cpp \ - dialogs/qpagesetupdialog.cpp \ - dialogs/qprintpreviewdialog.cpp + dialogs/qpagesetupdialog.cpp + +qtConfig(printpreviewdialog) { + HEADERS += dialogs/qprintpreviewdialog.h + SOURCES += dialogs/qprintpreviewdialog.cpp +} FORMS += dialogs/qpagesetupwidget.ui RESOURCES += dialogs/qprintdialog.qrc diff --git a/src/printsupport/dialogs/qprintpreviewdialog.cpp b/src/printsupport/dialogs/qprintpreviewdialog.cpp index 33ba842a1f..fd23aea460 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.cpp +++ b/src/printsupport/dialogs/qprintpreviewdialog.cpp @@ -56,8 +56,6 @@ #include <QtWidgets/qtoolbar.h> #include <QtCore/QCoreApplication> -#ifndef QT_NO_PRINTPREVIEWDIALOG - #include "private/qdialog_p.h" #include <QtWidgets/qformlayout.h> @@ -787,7 +785,3 @@ QT_END_NAMESPACE #include "moc_qprintpreviewdialog.cpp" #include "qprintpreviewdialog.moc" - -#endif // QT_NO_PRINTPREVIEWDIALOG - - diff --git a/src/printsupport/dialogs/qprintpreviewdialog.h b/src/printsupport/dialogs/qprintpreviewdialog.h index 640369fdf3..3b8f8a1171 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.h +++ b/src/printsupport/dialogs/qprintpreviewdialog.h @@ -42,12 +42,11 @@ #include <QtPrintSupport/qtprintsupportglobal.h> -#ifndef QT_NO_PRINTPREVIEWDIALOG - #include <QtWidgets/qdialog.h> -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(printpreviewdialog); +QT_BEGIN_NAMESPACE class QGraphicsView; class QPrintPreviewDialogPrivate; @@ -91,6 +90,4 @@ private: QT_END_NAMESPACE -#endif // QT_NO_PRINTPREVIEWDIALOG - #endif // QPRINTPREVIEWDIALOG_H |