diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2017-05-29 17:11:20 +0200 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-05-30 17:21:17 +0000 |
| commit | f209215c0d96c8badcc14a3fc1cd8a6b0e56625c (patch) | |
| tree | 5213913c7c405730f1c7bcaf1ba46b0b9b666ee6 /src/printsupport/widgets | |
| parent | e0b39313b068b41b0689b37bed6750dd0459ab89 (diff) | |
Convert features.printpreviewwidget to QT_[REQUIRE_]CONFIG
Change-Id: I7e38179acd93bf8c7c48c79ff5e304d893460758
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/printsupport/widgets')
| -rw-r--r-- | src/printsupport/widgets/qprintpreviewwidget.cpp | 4 | ||||
| -rw-r--r-- | src/printsupport/widgets/qprintpreviewwidget.h | 3 | ||||
| -rw-r--r-- | src/printsupport/widgets/widgets.pri | 6 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/printsupport/widgets/qprintpreviewwidget.cpp b/src/printsupport/widgets/qprintpreviewwidget.cpp index fd1cf68587..b28e693612 100644 --- a/src/printsupport/widgets/qprintpreviewwidget.cpp +++ b/src/printsupport/widgets/qprintpreviewwidget.cpp @@ -48,8 +48,6 @@ #include <QtWidgets/qscrollbar.h> #include <QtWidgets/qstyleoption.h> -#ifndef QT_NO_PRINTPREVIEWWIDGET - QT_BEGIN_NAMESPACE namespace { @@ -831,5 +829,3 @@ QT_END_NAMESPACE #include "moc_qprintpreviewwidget.cpp" #include "qprintpreviewwidget.moc" - -#endif // QT_NO_PRINTPREVIEWWIDGET diff --git a/src/printsupport/widgets/qprintpreviewwidget.h b/src/printsupport/widgets/qprintpreviewwidget.h index dec7092eb1..8735d06072 100644 --- a/src/printsupport/widgets/qprintpreviewwidget.h +++ b/src/printsupport/widgets/qprintpreviewwidget.h @@ -44,7 +44,7 @@ #include <QtWidgets/qwidget.h> #include <QtPrintSupport/qprinter.h> -#ifndef QT_NO_PRINTPREVIEWWIDGET +QT_REQUIRE_CONFIG(printpreviewwidget); QT_BEGIN_NAMESPACE @@ -114,5 +114,4 @@ private: QT_END_NAMESPACE -#endif // QT_NO_PRINTPREVIEWWIDGET #endif // QPRINTPREVIEWWIDGET_H diff --git a/src/printsupport/widgets/widgets.pri b/src/printsupport/widgets/widgets.pri index 1fa32764e8..1b5f0aca34 100644 --- a/src/printsupport/widgets/widgets.pri +++ b/src/printsupport/widgets/widgets.pri @@ -1,5 +1,7 @@ -HEADERS += widgets/qprintpreviewwidget.h -SOURCES += widgets/qprintpreviewwidget.cpp +qtConfig(printpreviewwidget) { + HEADERS += widgets/qprintpreviewwidget.h + SOURCES += widgets/qprintpreviewwidget.cpp +} unix:!darwin:qtConfig(cupsjobwidget) { HEADERS += widgets/qcupsjobwidget_p.h |