whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert features.stackedwidget to QT_[REQUIRE_]CONFIG 

Change-Id: I06b7fb9736620dcdfda21fc0a06e13cb02f9a1e7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
bb10
Stephan Binner 2017-08-27 19:05:49 +02:00
parent fc37e03699
commit b649717784
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/accessible/qaccessiblewidgetfactory.cpp
View File

@ -177,7 +177,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje
iface = new QAccessibleDisplay(widget, QAccessible::ToolTip);
} else if (classname == QLatin1String("QFrame")) {
iface = new QAccessibleWidget(widget, QAccessible::Border);
#ifndef QT_NO_STACKEDWIDGET
#if QT_CONFIG(stackedwidget)
} else if (classname == QLatin1String("QStackedWidget")) {
iface = new QAccessibleStackedWidget(widget);
#endif

6
src/widgets/accessible/qaccessiblewidgets.cpp
View File

@ -52,7 +52,9 @@
#endif
#include "qdebug.h"
#include <QApplication>
#if QT_CONFIG(stackedwidget)
#include <QStackedWidget>
#endif
#if QT_CONFIG(toolbox)
#include <QToolBox>
#endif
@ -310,7 +312,7 @@ void QAccessibleTextEdit::scrollToSubstring(int startIndex, int endIndex)
#endif // QT_NO_TEXTEDIT && QT_NO_CURSOR
#ifndef QT_NO_STACKEDWIDGET
#if QT_CONFIG(stackedwidget)
// ======================= QAccessibleStackedWidget ======================
QAccessibleStackedWidget::QAccessibleStackedWidget(QWidget *widget)
: QAccessibleWidget(widget, QAccessible::LayeredPane)
@ -356,7 +358,7 @@ QStackedWidget *QAccessibleStackedWidget::stackedWidget() const
{
return static_cast<QStackedWidget *>(object());
}
#endif // QT_NO_STACKEDWIDGET
#endif // QT_CONFIG(stackedwidget)
#if QT_CONFIG(toolbox)
// ======================= QAccessibleToolBox ======================

2
src/widgets/styles/qwindowsxpstyle.cpp
View File

@ -74,7 +74,9 @@
#if QT_CONFIG(listview)
#include <qlistview.h>
#endif
#if QT_CONFIG(stackedwidget)
#include <qstackedwidget.h>
#endif
#if QT_CONFIG(pushbutton)
#include <qpushbutton.h>
#endif

4
src/widgets/widgets/qstackedwidget.cpp
View File

@ -39,8 +39,6 @@
#include "qstackedwidget.h"
#ifndef QT_NO_STACKEDWIDGET
#include <qstackedlayout.h>
#include <qevent.h>
#include <private/qframe_p.h>
@ -294,5 +292,3 @@ bool QStackedWidget::event(QEvent *e)
QT_END_NAMESPACE
#include "moc_qstackedwidget.cpp"
#endif // QT_NO_STACKEDWIDGET

7
src/widgets/widgets/qstackedwidget.h
View File

@ -43,11 +43,10 @@
#include <QtWidgets/qtwidgetsglobal.h>
#include <QtWidgets/qframe.h>
QT_REQUIRE_CONFIG(stackedwidget);
QT_BEGIN_NAMESPACE
#ifndef QT_NO_STACKEDWIDGET
class QStackedWidgetPrivate;
class Q_WIDGETS_EXPORT QStackedWidget : public QFrame
@ -87,8 +86,6 @@ private:
Q_DECLARE_PRIVATE(QStackedWidget)
};
#endif // QT_NO_STACKEDWIDGET
QT_END_NAMESPACE
#endif // QSTACKEDWIDGET_H

7
src/widgets/widgets/widgets.pri
View File

@ -25,7 +25,6 @@ HEADERS += \
widgets/qsizegrip.h \
widgets/qslider.h \
widgets/qspinbox.h \
widgets/qstackedwidget.h \
widgets/qtextedit.h \
widgets/qtextedit_p.h \
widgets/qtoolbar.h \
@ -60,7 +59,6 @@ SOURCES += \
widgets/qsizegrip.cpp \
widgets/qslider.cpp \
widgets/qspinbox.cpp \
widgets/qstackedwidget.cpp \
widgets/qtextedit.cpp \
widgets/qtoolbar.cpp \
widgets/qtoolbarlayout.cpp \
@ -232,6 +230,11 @@ qtConfig(splitter) {
SOURCES += widgets/qsplitter.cpp
}
qtConfig(stackedwidget) {
HEADERS += widgets/qstackedwidget.h
SOURCES += widgets/qstackedwidget.cpp
}
qtConfig(statusbar) {
HEADERS += widgets/qstatusbar.h
SOURCES += widgets/qstatusbar.cpp