1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert features.splitter to QT_[REQUIRE_]CONFIG

Browse Source 
Change-Id: I2eea5004938c581beb5a7c0c01409c576c5e5b39
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Stephan Binner 2017-07-29 08:59:05 +02:00
parent 39851c6905
commit e58fdbaeb0
8 changed files with 19 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

@ -159,7 +159,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje
#endif #endif
} else if (classname == QLatin1String("QSizeGrip")) { } else if (classname == QLatin1String("QSizeGrip")) {
iface = new QAccessibleWidget(widget, QAccessible::Grip); iface = new QAccessibleWidget(widget, QAccessible::Grip);
#ifndef QT_NO_SPLITTER #if QT_CONFIG(splitter)
} else if (classname == QLatin1String("QSplitter")) { } else if (classname == QLatin1String("QSplitter")) {
iface = new QAccessibleWidget(widget, QAccessible::Splitter); iface = new QAccessibleWidget(widget, QAccessible::Splitter);
} else if (classname == QLatin1String("QSplitterHandle")) { } else if (classname == QLatin1String("QSplitterHandle")) {

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

@ -69,7 +69,9 @@
#include <qabstractslider.h> #include <qabstractslider.h>
#endif #endif
#include <qslider.h> #include <qslider.h>
#if QT_CONFIG(splitter)
#include <qsplitter.h> #include <qsplitter.h>
#endif
#if QT_CONFIG(progressbar) #if QT_CONFIG(progressbar)
#include <qprogressbar.h> #include <qprogressbar.h>
#endif #endif

2
src/widgets/styles/qmacstyle_mac_p_p.h
View File

@ -97,7 +97,9 @@
#endif #endif
#include <qsizegrip.h> #include <qsizegrip.h>
#include <qspinbox.h> #include <qspinbox.h>
#if QT_CONFIG(splitter)
#include <qsplitter.h> #include <qsplitter.h>
#endif
#include <qstyleoption.h> #include <qstyleoption.h>
#include <qtextedit.h> #include <qtextedit.h>
#include <qtextstream.h> #include <qtextstream.h>

4
src/widgets/styles/qwindowsstyle.cpp
View File

@ -1494,11 +1494,11 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
opt->state & (State_Sunken | State_On), 1, opt->state & (State_Sunken | State_On), 1,
&opt->palette.brush(QPalette::Button)); &opt->palette.brush(QPalette::Button));
break; break;
#ifndef QT_NO_SPLITTER #if QT_CONFIG(splitter)
case CE_Splitter: case CE_Splitter:
p->eraseRect(opt->rect); p->eraseRect(opt->rect);
break; break;
#endif // QT_NO_SPLITTER #endif // QT_CONFIG(splitter)
#if QT_CONFIG(scrollbar) #if QT_CONFIG(scrollbar)
case CE_ScrollBarSubLine: case CE_ScrollBarSubLine:
case CE_ScrollBarAddLine: { case CE_ScrollBarAddLine: {

3
src/widgets/widgets/qsplitter.cpp
View File

@ -38,7 +38,6 @@
****************************************************************************/ ****************************************************************************/
#include "qsplitter.h" #include "qsplitter.h"
#ifndef QT_NO_SPLITTER
#include "qapplication.h" #include "qapplication.h"
#include "qcursor.h" #include "qcursor.h"
@ -1820,5 +1819,3 @@ QTextStream& operator>>(QTextStream& ts, QSplitter& splitter)
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qsplitter.cpp" #include "moc_qsplitter.cpp"
#endif // QT_NO_SPLITTER

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

@ -44,11 +44,10 @@
#include <QtWidgets/qframe.h> #include <QtWidgets/qframe.h>
#include <QtWidgets/qsizepolicy.h> #include <QtWidgets/qsizepolicy.h>
QT_REQUIRE_CONFIG(splitter);
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_SPLITTER
class QSplitterPrivate; class QSplitterPrivate;
class QTextStream; class QTextStream;
template <typename T> class QList; template <typename T> class QList;
@ -164,8 +163,6 @@ private:
Q_DECLARE_PRIVATE(QSplitterHandle) Q_DECLARE_PRIVATE(QSplitterHandle)
}; };
#endif // QT_NO_SPLITTER
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QSPLITTER_H #endif // QSPLITTER_H

2
src/widgets/widgets/qsplitter_p.h
View File

@ -54,6 +54,8 @@
#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtWidgets/private/qtwidgetsglobal_p.h>
#include "private/qframe_p.h" #include "private/qframe_p.h"
QT_REQUIRE_CONFIG(splitter);
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
static const uint Default = 2; static const uint Default = 2;

11
src/widgets/widgets/widgets.pri
View File

@ -25,8 +25,6 @@ HEADERS += \
widgets/qsizegrip.h \ widgets/qsizegrip.h \
widgets/qslider.h \ widgets/qslider.h \
widgets/qspinbox.h \ widgets/qspinbox.h \
widgets/qsplitter.h \
widgets/qsplitter_p.h \
widgets/qstackedwidget.h \ widgets/qstackedwidget.h \
widgets/qtextedit.h \ widgets/qtextedit.h \
widgets/qtextedit_p.h \ widgets/qtextedit_p.h \
@ -64,7 +62,6 @@ SOURCES += \
widgets/qsizegrip.cpp \ widgets/qsizegrip.cpp \
widgets/qslider.cpp \ widgets/qslider.cpp \
widgets/qspinbox.cpp \ widgets/qspinbox.cpp \
widgets/qsplitter.cpp \
widgets/qstackedwidget.cpp \ widgets/qstackedwidget.cpp \
widgets/qtextedit.cpp \ widgets/qtextedit.cpp \
widgets/qtoolbar.cpp \ widgets/qtoolbar.cpp \
@ -231,6 +228,14 @@ qtConfig(splashscreen) {
widgets/qsplashscreen.cpp widgets/qsplashscreen.cpp
} }
qtConfig(splitter) {
HEADERS += \
widgets/qsplitter.h \
widgets/qsplitter_p.h
SOURCES += widgets/qsplitter.cpp
}
qtConfig(statusbar) { qtConfig(statusbar) {
HEADERS += widgets/qstatusbar.h HEADERS += widgets/qstatusbar.h
SOURCES += widgets/qstatusbar.cpp SOURCES += widgets/qstatusbar.cpp