From fd4f9c5e0cba786b34225718f9bb7bf1a1bafec1 Mon Sep 17 00:00:00 2001 From: Stephan Binner Date: Tue, 30 May 2017 20:43:59 +0200 Subject: Convert features.progressdialog to QT_[REQUIRE_]CONFIG Change-Id: Ic12a30480260e426f106baf7e2121889ea01db88 Reviewed-by: Oswald Buddenhagen --- src/widgets/dialogs/dialogs.pri | 7 +++++-- src/widgets/dialogs/qprogressdialog.cpp | 4 ---- src/widgets/dialogs/qprogressdialog.h | 7 ++----- 3 files changed, 7 insertions(+), 11 deletions(-) (limited to 'src/widgets/dialogs') diff --git a/src/widgets/dialogs/dialogs.pri b/src/widgets/dialogs/dialogs.pri index 584aef1da1..9307a80009 100644 --- a/src/widgets/dialogs/dialogs.pri +++ b/src/widgets/dialogs/dialogs.pri @@ -8,7 +8,6 @@ HEADERS += \ dialogs/qfontdialog_p.h \ dialogs/qinputdialog.h \ dialogs/qmessagebox.h \ - dialogs/qprogressdialog.h \ dialogs/qfilesystemmodel.h \ dialogs/qfilesystemmodel_p.h \ dialogs/qfileinfogatherer_p.h \ @@ -26,7 +25,6 @@ SOURCES += \ dialogs/qfontdialog.cpp \ dialogs/qinputdialog.cpp \ dialogs/qmessagebox.cpp \ - dialogs/qprogressdialog.cpp \ dialogs/qfilesystemmodel.cpp \ dialogs/qfileinfogatherer.cpp \ dialogs/qwizard.cpp \ @@ -53,4 +51,9 @@ qtConfig(filedialog) { FORMS += dialogs/qfiledialog.ui } +qtConfig(progressdialog) { + HEADERS += dialogs/qprogressdialog.h + SOURCES += dialogs/qprogressdialog.cpp +} + RESOURCES += dialogs/qmessagebox.qrc diff --git a/src/widgets/dialogs/qprogressdialog.cpp b/src/widgets/dialogs/qprogressdialog.cpp index 26a8fcc92d..893920cbd9 100644 --- a/src/widgets/dialogs/qprogressdialog.cpp +++ b/src/widgets/dialogs/qprogressdialog.cpp @@ -39,8 +39,6 @@ #include "qprogressdialog.h" -#ifndef QT_NO_PROGRESSDIALOG - #include "qshortcut.h" #include "qpainter.h" #include "qdrawutil.h" @@ -886,5 +884,3 @@ void QProgressDialog::open(QObject *receiver, const char *member) QT_END_NAMESPACE #include "moc_qprogressdialog.cpp" - -#endif // QT_NO_PROGRESSDIALOG diff --git a/src/widgets/dialogs/qprogressdialog.h b/src/widgets/dialogs/qprogressdialog.h index f4e63fb088..902a4de5d2 100644 --- a/src/widgets/dialogs/qprogressdialog.h +++ b/src/widgets/dialogs/qprogressdialog.h @@ -42,12 +42,11 @@ #include -#ifndef QT_NO_PROGRESSDIALOG - #include -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(progressdialog); +QT_BEGIN_NAMESPACE class QPushButton; class QLabel; @@ -130,6 +129,4 @@ private: QT_END_NAMESPACE -#endif // QT_NO_PROGRESSDIALOG - #endif // QPROGRESSDIALOG_H -- cgit v1.2.3