Convert features.progressdialog to QT_[REQUIRE_]CONFIG
Change-Id: Ic12a30480260e426f106baf7e2121889ea01db88 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
parent
1ebe68b01f
commit
fd4f9c5e0c
@ -8,7 +8,6 @@ HEADERS += \
|
|||||||
dialogs/qfontdialog_p.h \
|
dialogs/qfontdialog_p.h \
|
||||||
dialogs/qinputdialog.h \
|
dialogs/qinputdialog.h \
|
||||||
dialogs/qmessagebox.h \
|
dialogs/qmessagebox.h \
|
||||||
dialogs/qprogressdialog.h \
|
|
||||||
dialogs/qfilesystemmodel.h \
|
dialogs/qfilesystemmodel.h \
|
||||||
dialogs/qfilesystemmodel_p.h \
|
dialogs/qfilesystemmodel_p.h \
|
||||||
dialogs/qfileinfogatherer_p.h \
|
dialogs/qfileinfogatherer_p.h \
|
||||||
@ -26,7 +25,6 @@ SOURCES += \
|
|||||||
dialogs/qfontdialog.cpp \
|
dialogs/qfontdialog.cpp \
|
||||||
dialogs/qinputdialog.cpp \
|
dialogs/qinputdialog.cpp \
|
||||||
dialogs/qmessagebox.cpp \
|
dialogs/qmessagebox.cpp \
|
||||||
dialogs/qprogressdialog.cpp \
|
|
||||||
dialogs/qfilesystemmodel.cpp \
|
dialogs/qfilesystemmodel.cpp \
|
||||||
dialogs/qfileinfogatherer.cpp \
|
dialogs/qfileinfogatherer.cpp \
|
||||||
dialogs/qwizard.cpp \
|
dialogs/qwizard.cpp \
|
||||||
@ -53,4 +51,9 @@ qtConfig(filedialog) {
|
|||||||
FORMS += dialogs/qfiledialog.ui
|
FORMS += dialogs/qfiledialog.ui
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qtConfig(progressdialog) {
|
||||||
|
HEADERS += dialogs/qprogressdialog.h
|
||||||
|
SOURCES += dialogs/qprogressdialog.cpp
|
||||||
|
}
|
||||||
|
|
||||||
RESOURCES += dialogs/qmessagebox.qrc
|
RESOURCES += dialogs/qmessagebox.qrc
|
||||||
|
@ -39,8 +39,6 @@
|
|||||||
|
|
||||||
#include "qprogressdialog.h"
|
#include "qprogressdialog.h"
|
||||||
|
|
||||||
#ifndef QT_NO_PROGRESSDIALOG
|
|
||||||
|
|
||||||
#include "qshortcut.h"
|
#include "qshortcut.h"
|
||||||
#include "qpainter.h"
|
#include "qpainter.h"
|
||||||
#include "qdrawutil.h"
|
#include "qdrawutil.h"
|
||||||
@ -886,5 +884,3 @@ void QProgressDialog::open(QObject *receiver, const char *member)
|
|||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
#include "moc_qprogressdialog.cpp"
|
#include "moc_qprogressdialog.cpp"
|
||||||
|
|
||||||
#endif // QT_NO_PROGRESSDIALOG
|
|
||||||
|
@ -42,12 +42,11 @@
|
|||||||
|
|
||||||
#include <QtWidgets/qtwidgetsglobal.h>
|
#include <QtWidgets/qtwidgetsglobal.h>
|
||||||
|
|
||||||
#ifndef QT_NO_PROGRESSDIALOG
|
|
||||||
|
|
||||||
#include <QtWidgets/qdialog.h>
|
#include <QtWidgets/qdialog.h>
|
||||||
|
|
||||||
QT_BEGIN_NAMESPACE
|
QT_REQUIRE_CONFIG(progressdialog);
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
class QPushButton;
|
class QPushButton;
|
||||||
class QLabel;
|
class QLabel;
|
||||||
@ -130,6 +129,4 @@ private:
|
|||||||
|
|
||||||
QT_END_NAMESPACE
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
#endif // QT_NO_PROGRESSDIALOG
|
|
||||||
|
|
||||||
#endif // QPROGRESSDIALOG_H
|
#endif // QPROGRESSDIALOG_H
|
||||||
|
Loading…
x
Reference in New Issue
Block a user