diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2017-05-21 12:53:07 +0200 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-05-29 10:46:53 +0000 |
| commit | ad8b4ba0145696ad0da3ab9fad0dee9bad6d567a (patch) | |
| tree | 4fc7eff6af7a46e3a481411e58bdb0e6f1be08a9 /src/widgets/widgets | |
| parent | 61384e910d0dcf68495ac247388ab965e31dcae7 (diff) | |
Convert features.splashscreen to QT_REQUIRE_CONFIG
Change-Id: Ie46b7c6fb52773dea25c552a77c96d800f471738
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qsplashscreen.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/widgets/qsplashscreen.h | 6 | ||||
| -rw-r--r-- | src/widgets/widgets/widgets.pri | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/widgets/widgets/qsplashscreen.cpp b/src/widgets/widgets/qsplashscreen.cpp index 2758af53ef..fb92d5de0d 100644 --- a/src/widgets/widgets/qsplashscreen.cpp +++ b/src/widgets/widgets/qsplashscreen.cpp @@ -39,8 +39,6 @@ #include "qsplashscreen.h" -#ifndef QT_NO_SPLASHSCREEN - #include "qapplication.h" #include "qdesktopwidget.h" #include "qpainter.h" @@ -354,5 +352,3 @@ bool QSplashScreen::event(QEvent *e) QT_END_NAMESPACE #include "moc_qsplashscreen.cpp" - -#endif //QT_NO_SPLASHSCREEN diff --git a/src/widgets/widgets/qsplashscreen.h b/src/widgets/widgets/qsplashscreen.h index de58d86592..1971b8bacf 100644 --- a/src/widgets/widgets/qsplashscreen.h +++ b/src/widgets/widgets/qsplashscreen.h @@ -44,10 +44,10 @@ #include <QtGui/qpixmap.h> #include <QtWidgets/qwidget.h> -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(splashscreen); +QT_BEGIN_NAMESPACE -#ifndef QT_NO_SPLASHSCREEN class QSplashScreenPrivate; class Q_WIDGETS_EXPORT QSplashScreen : public QWidget @@ -82,8 +82,6 @@ private: Q_DECLARE_PRIVATE(QSplashScreen) }; -#endif // QT_NO_SPLASHSCREEN - QT_END_NAMESPACE #endif // QSPLASHSCREEN_H diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri index 4d627e6f07..1779c8d183 100644 --- a/src/widgets/widgets/widgets.pri +++ b/src/widgets/widgets/widgets.pri @@ -40,7 +40,6 @@ HEADERS += \ widgets/qsizegrip.h \ widgets/qslider.h \ widgets/qspinbox.h \ - widgets/qsplashscreen.h \ widgets/qsplitter.h \ widgets/qsplitter_p.h \ widgets/qstackedwidget.h \ @@ -97,7 +96,6 @@ SOURCES += \ widgets/qsizegrip.cpp \ widgets/qslider.cpp \ widgets/qspinbox.cpp \ - widgets/qsplashscreen.cpp \ widgets/qsplitter.cpp \ widgets/qstackedwidget.cpp \ widgets/qstatusbar.cpp \ @@ -196,6 +194,14 @@ qtConfig(dialogbuttonbox) { widgets/qdialogbuttonbox.cpp } +qtConfig(splashscreen) { + HEADERS += \ + widgets/qsplashscreen.h + + SOURCES += \ + widgets/qsplashscreen.cpp +} + qtConfig(widgettextcontrol) { HEADERS += \ widgets/qwidgettextcontrol_p.h \ |