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

Convert features.mainwindow to QT_[REQUIRE_]CONFIG

Browse Source 
Change-Id: If7efc8c15d8876f5bc5575d48686894ea71bbe62
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Stephan Binner 2017-08-27 19:08:17 +02:00
parent 689606de91
commit 79851be729
19 changed files with 59 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje
iface = new QAccessibleWidget(widget, QAccessible::Dialog); iface = new QAccessibleWidget(widget, QAccessible::Dialog);
} else if (classname == QLatin1String("QMessageBox")) { } else if (classname == QLatin1String("QMessageBox")) {
iface = new QAccessibleWidget(widget, QAccessible::AlertMessage); iface = new QAccessibleWidget(widget, QAccessible::AlertMessage);
#ifndef QT_NO_MAINWINDOW #if QT_CONFIG(mainwindow)
} else if (classname == QLatin1String("QMainWindow")) { } else if (classname == QLatin1String("QMainWindow")) {
iface = new QAccessibleMainWindow(widget); iface = new QAccessibleMainWindow(widget);
#endif #endif

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

@ -80,7 +80,9 @@
#include <QDockWidget> #include <QDockWidget>
#include <private/qdockwidget_p.h> #include <private/qdockwidget_p.h>
#endif #endif
#if QT_CONFIG(mainwindow)
#include <QMainWindow> #include <QMainWindow>
#endif
#include <QFocusFrame> #include <QFocusFrame>
#ifndef QT_NO_ACCESSIBILITY #ifndef QT_NO_ACCESSIBILITY
@ -1090,7 +1092,7 @@ void QAccessibleTextWidget::replaceText(int startOffset, int endOffset, const QS
#endif // QT_NO_CURSOR #endif // QT_NO_CURSOR
#ifndef QT_NO_MAINWINDOW #if QT_CONFIG(mainwindow)
QAccessibleMainWindow::QAccessibleMainWindow(QWidget *widget) QAccessibleMainWindow::QAccessibleMainWindow(QWidget *widget)
: QAccessibleWidget(widget, QAccessible::Window) { } : QAccessibleWidget(widget, QAccessible::Window) { }
@ -1139,7 +1141,7 @@ QMainWindow *QAccessibleMainWindow::mainWindow() const
return qobject_cast<QMainWindow *>(object()); return qobject_cast<QMainWindow *>(object());
} }
#endif //QT_NO_MAINWINDOW #endif // QT_CONFIG(mainwindow)
QT_END_NAMESPACE QT_END_NAMESPACE

4
src/widgets/accessible/qaccessiblewidgets_p.h
View File

@ -304,7 +304,7 @@ protected:
#endif // QT_CONFIG(dockwidget) #endif // QT_CONFIG(dockwidget)
#ifndef QT_NO_MAINWINDOW #if QT_CONFIG(mainwindow)
class QAccessibleMainWindow : public QAccessibleWidget class QAccessibleMainWindow : public QAccessibleWidget
{ {
public: public:
@ -317,7 +317,7 @@ public:
QMainWindow *mainWindow() const; QMainWindow *mainWindow() const;
}; };
#endif //QT_NO_MAINWINDOW #endif // QT_CONFIG(mainwindow)
#endif // QT_NO_ACCESSIBILITY #endif // QT_NO_ACCESSIBILITY

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

@ -55,7 +55,9 @@
#include <qdir.h> #include <qdir.h>
#include <qstyleoption.h> #include <qstyleoption.h>
#include <qapplication.h> #include <qapplication.h>
#if QT_CONFIG(mainwindow)
#include <qmainwindow.h> #include <qmainwindow.h>
#endif
#include <qfont.h> #include <qfont.h>
#if QT_CONFIG(groupbox) #if QT_CONFIG(groupbox)
#include <qgroupbox.h> #include <qgroupbox.h>

10
src/widgets/styles/qmacstyle_mac.mm
View File

@ -74,7 +74,9 @@
#include <qhash.h> #include <qhash.h>
#include <qheaderview.h> #include <qheaderview.h>
#include <qlineedit.h> #include <qlineedit.h>
#if QT_CONFIG(mainwindow)
#include <qmainwindow.h> #include <qmainwindow.h>
#endif
#include <qmdisubwindow.h> #include <qmdisubwindow.h>
#if QT_CONFIG(menubar) #if QT_CONFIG(menubar)
#include <qmenubar.h> #include <qmenubar.h>
@ -959,7 +961,7 @@ static QAquaWidgetSize qt_aqua_guess_size(const QWidget *widg, QSize large, QSiz
return QAquaSizeLarge; return QAquaSizeLarge;
} }
#ifndef QT_NO_MAINWINDOW #if QT_CONFIG(mainwindow)
if (qEnvironmentVariableIsSet("QWIDGET_ALL_SMALL")) { if (qEnvironmentVariableIsSet("QWIDGET_ALL_SMALL")) {
//if (small.width() != -1 || small.height() != -1) //if (small.width() != -1 || small.height() != -1)
return QAquaSizeSmall; return QAquaSizeSmall;
@ -2457,7 +2459,7 @@ int QMacStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const QW
#endif #endif
break; break;
case PM_DefaultFrameWidth: case PM_DefaultFrameWidth:
#ifndef QT_NO_MAINWINDOW #if QT_CONFIG(mainwindow)
if (widget && (widget->isWindow() || !widget->parentWidget() if (widget && (widget->isWindow() || !widget->parentWidget()
|| (qobject_cast<const QMainWindow*>(widget->parentWidget()) || (qobject_cast<const QMainWindow*>(widget->parentWidget())
&& static_cast<QMainWindow *>(widget->parentWidget())->centralWidget() == widget)) && static_cast<QMainWindow *>(widget->parentWidget())->centralWidget() == widget))
@ -4801,7 +4803,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
// the title bar. The following code fills the toolBar area with transparent pixels // the title bar. The following code fills the toolBar area with transparent pixels
// to make that gradient visible. // to make that gradient visible.
if (w) { if (w) {
#ifndef QT_NO_MAINWINDOW #if QT_CONFIG(mainwindow)
if (QMainWindow * mainWindow = qobject_cast<QMainWindow *>(w->window())) { if (QMainWindow * mainWindow = qobject_cast<QMainWindow *>(w->window())) {
if (toolBar && toolBar->toolBarArea == Qt::TopToolBarArea && mainWindow->unifiedTitleAndToolBarOnMac()) { if (toolBar && toolBar->toolBarArea == Qt::TopToolBarArea && mainWindow->unifiedTitleAndToolBarOnMac()) {
@ -6986,7 +6988,7 @@ bool QMacStyle::event(QEvent *e)
QWidget *top = f->parentWidget(); QWidget *top = f->parentWidget();
while (top && !top->isWindow() && !(top->windowType() == Qt::SubWindow)) while (top && !top->isWindow() && !(top->windowType() == Qt::SubWindow))
top = top->parentWidget(); top = top->parentWidget();
#ifndef QT_NO_MAINWINDOW #if QT_CONFIG(mainwindow)
if (qobject_cast<QMainWindow *>(top)) { if (qobject_cast<QMainWindow *>(top)) {
QWidget *central = static_cast<QMainWindow *>(top)->centralWidget(); QWidget *central = static_cast<QMainWindow *>(top)->centralWidget();
for (const QWidget *par = f; par; par = par->parentWidget()) { for (const QWidget *par = f; par; par = par->parentWidget()) {

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

@ -78,7 +78,9 @@
#if QT_CONFIG(listview) #if QT_CONFIG(listview)
#include <qlistview.h> #include <qlistview.h>
#endif #endif
#if QT_CONFIG(mainwindow)
#include <qmainwindow.h> #include <qmainwindow.h>
#endif
#include <qmap.h> #include <qmap.h>
#if QT_CONFIG(menubar) #if QT_CONFIG(menubar)
#include <qmenubar.h> #include <qmenubar.h>

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

@ -85,7 +85,9 @@
#include <qtabbar.h> #include <qtabbar.h>
#endif #endif
#include <QMetaProperty> #include <QMetaProperty>
#if QT_CONFIG(mainwindow)
#include <qmainwindow.h> #include <qmainwindow.h>
#endif
#if QT_CONFIG(dockwidget) #if QT_CONFIG(dockwidget)
#include <qdockwidget.h> #include <qdockwidget.h>
#endif #endif
@ -2825,7 +2827,7 @@ void QStyleSheetStyle::polish(QWidget *w)
#ifndef QT_NO_FRAME #ifndef QT_NO_FRAME
|| qobject_cast<QFrame *>(w) || qobject_cast<QFrame *>(w)
#endif #endif
#ifndef QT_NO_MAINWINDOW #if QT_CONFIG(mainwindow)
|| qobject_cast<QMainWindow *>(w) || qobject_cast<QMainWindow *>(w)
#endif #endif
#ifndef QT_NO_MDIAREA #ifndef QT_NO_MDIAREA

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

@ -62,7 +62,9 @@
#endif #endif
#include "qwidget.h" #include "qwidget.h"
#include "qdebug.h" #include "qdebug.h"
#if QT_CONFIG(mainwindow)
#include "qmainwindow.h" #include "qmainwindow.h"
#endif
#include "qfile.h" #include "qfile.h"
#include "qtextstream.h" #include "qtextstream.h"
#include "qpixmapcache.h" #include "qpixmapcache.h"
@ -1113,7 +1115,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai
break; break;
#endif // QT_CONFIG(rubberband) #endif // QT_CONFIG(rubberband)
#if !defined(QT_NO_MENU) && !defined(QT_NO_MAINWINDOW) #if !defined(QT_NO_MENU) && QT_CONFIG(mainwindow)
case CE_MenuBarEmptyArea: case CE_MenuBarEmptyArea:
if (widget && qobject_cast<const QMainWindow *>(widget->parentWidget())) { if (widget && qobject_cast<const QMainWindow *>(widget->parentWidget())) {
p->fillRect(opt->rect, opt->palette.button()); p->fillRect(opt->rect, opt->palette.button());

12
src/widgets/widgets/qdockwidget.cpp
View File

@ -851,7 +851,7 @@ bool QDockWidgetPrivate::isAnimating() const
bool QDockWidgetPrivate::mousePressEvent(QMouseEvent *event) bool QDockWidgetPrivate::mousePressEvent(QMouseEvent *event)
{ {
#if !defined(QT_NO_MAINWINDOW) #if QT_CONFIG(mainwindow)
Q_Q(QDockWidget); Q_Q(QDockWidget);
QDockWidgetLayout *dwLayout QDockWidgetLayout *dwLayout
@ -880,7 +880,7 @@ bool QDockWidgetPrivate::mousePressEvent(QMouseEvent *event)
return true; return true;
} }
#endif // !defined(QT_NO_MAINWINDOW) #endif // QT_CONFIG(mainwindow)
return false; return false;
} }
@ -903,7 +903,7 @@ bool QDockWidgetPrivate::mouseDoubleClickEvent(QMouseEvent *event)
bool QDockWidgetPrivate::mouseMoveEvent(QMouseEvent *event) bool QDockWidgetPrivate::mouseMoveEvent(QMouseEvent *event)
{ {
bool ret = false; bool ret = false;
#if !defined(QT_NO_MAINWINDOW) #if QT_CONFIG(mainwindow)
Q_Q(QDockWidget); Q_Q(QDockWidget);
if (!state) if (!state)
@ -944,20 +944,20 @@ bool QDockWidgetPrivate::mouseMoveEvent(QMouseEvent *event)
ret = true; ret = true;
} }
#endif // !defined(QT_NO_MAINWINDOW) #endif // QT_CONFIG(mainwindow)
return ret; return ret;
} }
bool QDockWidgetPrivate::mouseReleaseEvent(QMouseEvent *event) bool QDockWidgetPrivate::mouseReleaseEvent(QMouseEvent *event)
{ {
#if !defined(QT_NO_MAINWINDOW) #if QT_CONFIG(mainwindow)
if (event->button() == Qt::LeftButton && state && !state->nca) { if (event->button() == Qt::LeftButton && state && !state->nca) {
endDrag(); endDrag();
return true; //filter out the event return true; //filter out the event
} }
#endif // !defined(QT_NO_MAINWINDOW) #endif // QT_CONFIG(mainwindow)
return false; return false;
} }

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

@ -42,8 +42,6 @@
#include "qmainwindow.h" #include "qmainwindow.h"
#include "qmainwindowlayout_p.h" #include "qmainwindowlayout_p.h"
#ifndef QT_NO_MAINWINDOW
#if QT_CONFIG(dockwidget) #if QT_CONFIG(dockwidget)
#include "qdockwidget.h" #include "qdockwidget.h"
#endif #endif
@ -1778,5 +1776,3 @@ QMenu *QMainWindow::createPopupMenu()
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qmainwindow.cpp" #include "moc_qmainwindow.cpp"
#endif // QT_NO_MAINWINDOW

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

@ -46,11 +46,10 @@
#include <QtWidgets/qtabwidget.h> #include <QtWidgets/qtabwidget.h>
#endif #endif
QT_REQUIRE_CONFIG(mainwindow);
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_MAINWINDOW
class QDockWidget; class QDockWidget;
class QMainWindowPrivate; class QMainWindowPrivate;
class QMenuBar; class QMenuBar;
@ -215,8 +214,6 @@ private:
Q_DECLARE_OPERATORS_FOR_FLAGS(QMainWindow::DockOptions) Q_DECLARE_OPERATORS_FOR_FLAGS(QMainWindow::DockOptions)
#endif // QT_NO_MAINWINDOW
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QDYNAMICMAINWINDOW_H #endif // QDYNAMICMAINWINDOW_H

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

@ -40,7 +40,6 @@
#include "qmainwindowlayout_p.h" #include "qmainwindowlayout_p.h"
#ifndef QT_NO_MAINWINDOW
#if QT_CONFIG(dockwidget) #if QT_CONFIG(dockwidget)
#include "qdockarealayout_p.h" #include "qdockarealayout_p.h"
#include "qdockwidget.h" #include "qdockwidget.h"
@ -2724,9 +2723,6 @@ void QMainWindowLayout::timerEvent(QTimerEvent *e)
QLayout::timerEvent(e); QLayout::timerEvent(e);
} }
QT_END_NAMESPACE QT_END_NAMESPACE
#include "moc_qmainwindowlayout_p.cpp" #include "moc_qmainwindowlayout_p.cpp"
#endif // QT_NO_MAINWINDOW

6
src/widgets/widgets/qmainwindowlayout_p.h
View File

@ -54,8 +54,6 @@
#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtWidgets/private/qtwidgetsglobal_p.h>
#include "qmainwindow.h" #include "qmainwindow.h"
#ifndef QT_NO_MAINWINDOW
#include "QtWidgets/qlayout.h" #include "QtWidgets/qlayout.h"
#if QT_CONFIG(tabbar) #if QT_CONFIG(tabbar)
#include "QtWidgets/qtabbar.h" #include "QtWidgets/qtabbar.h"
@ -71,6 +69,8 @@
#endif #endif
#include "qtoolbararealayout_p.h" #include "qtoolbararealayout_p.h"
QT_REQUIRE_CONFIG(mainwindow);
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QToolBar; class QToolBar;
@ -379,6 +379,4 @@ QDebug operator<<(QDebug debug, const QMainWindowLayout *layout);
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QT_NO_MAINWINDOW
#endif // QDYNAMICMAINWINDOWLAYOUT_P_H #endif // QDYNAMICMAINWINDOWLAYOUT_P_H

8
src/widgets/widgets/qmdisubwindow.cpp
View File

@ -157,7 +157,9 @@
#include <QWhatsThis> #include <QWhatsThis>
#endif #endif
#include <QToolTip> #include <QToolTip>
#if QT_CONFIG(mainwindow)
#include <QMainWindow> #include <QMainWindow>
#endif
#include <QScrollBar> #include <QScrollBar>
#include <QDebug> #include <QDebug>
#if QT_CONFIG(style_mac) #if QT_CONFIG(style_mac)
@ -741,7 +743,7 @@ ControlContainer::~ControlContainer()
*/ */
QMenuBar *QMdiSubWindowPrivate::menuBar() const QMenuBar *QMdiSubWindowPrivate::menuBar() const
{ {
#if defined(QT_NO_MAINWINDOW) #if !QT_CONFIG(mainwindow)
return 0; return 0;
#else #else
Q_Q(const QMdiSubWindow); Q_Q(const QMdiSubWindow);
@ -1784,7 +1786,7 @@ bool QMdiSubWindowPrivate::drawTitleBarWhenMaximized() const
#else #else
if (q->style()->styleHint(QStyle::SH_Workspace_FillSpaceOnMaximize, 0, q)) if (q->style()->styleHint(QStyle::SH_Workspace_FillSpaceOnMaximize, 0, q))
return true; return true;
#if !QT_CONFIG(menubar) || defined(QT_NO_MAINWINDOW) #if !QT_CONFIG(menubar) || !QT_CONFIG(mainwindow)
Q_UNUSED(isChildOfQMdiSubWindow); Q_UNUSED(isChildOfQMdiSubWindow);
return true; return true;
#else #else
@ -1850,7 +1852,7 @@ void QMdiSubWindowPrivate::removeButtonsFromMenuBar()
return; return;
QMenuBar *currentMenuBar = 0; QMenuBar *currentMenuBar = 0;
#ifndef QT_NO_MAINWINDOW #if QT_CONFIG(mainwindow)
if (QMainWindow *mainWindow = qobject_cast<QMainWindow *>(q->window())) { if (QMainWindow *mainWindow = qobject_cast<QMainWindow *>(q->window())) {
// NB! We can't use menuBar() here because that one will actually create // NB! We can't use menuBar() here because that one will actually create
// a menubar for us if not set. That's not what we want :-) // a menubar for us if not set. That's not what we want :-)

2
src/widgets/widgets/qmenubar.cpp
View File

@ -49,7 +49,9 @@
#include <qpainter.h> #include <qpainter.h>
#include <qstylepainter.h> #include <qstylepainter.h>
#include <qevent.h> #include <qevent.h>
#if QT_CONFIG(mainwindow)
#include <qmainwindow.h> #include <qmainwindow.h>
#endif
#include <qtoolbar.h> #include <qtoolbar.h>
#if QT_CONFIG(toolbutton) #if QT_CONFIG(toolbutton)
#include <qtoolbutton.h> #include <qtoolbutton.h>

2
src/widgets/widgets/qstatusbar.cpp
View File

@ -48,7 +48,9 @@
#include "qstyle.h" #include "qstyle.h"
#include "qstyleoption.h" #include "qstyleoption.h"
#include "qsizegrip.h" #include "qsizegrip.h"
#if QT_CONFIG(mainwindow)
#include "qmainwindow.h" #include "qmainwindow.h"
#endif
#ifndef QT_NO_ACCESSIBILITY #ifndef QT_NO_ACCESSIBILITY
#include "qaccessible.h" #include "qaccessible.h"

2
src/widgets/widgets/qtoolbutton.cpp
View File

@ -50,7 +50,9 @@
#include <qstyle.h> #include <qstyle.h>
#include <qstyleoption.h> #include <qstyleoption.h>
#include <qtooltip.h> #include <qtooltip.h>
#if QT_CONFIG(mainwindow)
#include <qmainwindow.h> #include <qmainwindow.h>
#endif
#include <qtoolbar.h> #include <qtoolbar.h>
#include <qvariant.h> #include <qvariant.h>
#include <qstylepainter.h> #include <qstylepainter.h>

8
src/widgets/widgets/qwidgetanimator.cpp
View File

@ -40,7 +40,9 @@
#include <QtCore/qpropertyanimation.h> #include <QtCore/qpropertyanimation.h>
#include <QtWidgets/qwidget.h> #include <QtWidgets/qwidget.h>
#include <QtWidgets/qstyle.h> #include <QtWidgets/qstyle.h>
#if QT_CONFIG(mainwindow)
#include <private/qmainwindowlayout_p.h> #include <private/qmainwindowlayout_p.h>
#endif
#include "qwidgetanimator_p.h" #include "qwidgetanimator_p.h"
@ -61,7 +63,7 @@ void QWidgetAnimator::abort(QWidget *w)
if (anim) { if (anim) {
anim->stop(); anim->stop();
} }
#ifndef QT_NO_MAINWINDOW #if QT_CONFIG(mainwindow)
m_mainWindowLayout->animationFinished(w); m_mainWindowLayout->animationFinished(w);
#endif #endif
#else #else
@ -108,9 +110,9 @@ void QWidgetAnimator::animate(QWidget *widget, const QRect &_final_geometry, boo
{ {
//we do it in one shot //we do it in one shot
widget->setGeometry(final_geometry); widget->setGeometry(final_geometry);
#ifndef QT_NO_MAINWINDOW #if QT_CONFIG(mainwindow)
m_mainWindowLayout->animationFinished(widget); m_mainWindowLayout->animationFinished(widget);
#endif //QT_NO_MAINWINDOW #endif // QT_CONFIG(mainwindow)
} }
} }

14
src/widgets/widgets/widgets.pri
View File

@ -7,8 +7,6 @@ HEADERS += \
widgets/qframe_p.h \ widgets/qframe_p.h \
widgets/qlineedit.h \ widgets/qlineedit.h \
widgets/qlineedit_p.h \ widgets/qlineedit_p.h \
widgets/qmainwindow.h \
widgets/qmainwindowlayout_p.h \
widgets/qmdiarea.h \ widgets/qmdiarea.h \
widgets/qmdiarea_p.h \ widgets/qmdiarea_p.h \
widgets/qmdisubwindow.h \ widgets/qmdisubwindow.h \
@ -38,8 +36,6 @@ SOURCES += \
widgets/qframe.cpp \ widgets/qframe.cpp \
widgets/qlineedit_p.cpp \ widgets/qlineedit_p.cpp \
widgets/qlineedit.cpp \ widgets/qlineedit.cpp \
widgets/qmainwindow.cpp \
widgets/qmainwindowlayout.cpp \
widgets/qmdiarea.cpp \ widgets/qmdiarea.cpp \
widgets/qmdisubwindow.cpp \ widgets/qmdisubwindow.cpp \
widgets/qmenu.cpp \ widgets/qmenu.cpp \
@ -177,6 +173,16 @@ qtConfig(lcdnumber) {
widgets/qlcdnumber.cpp widgets/qlcdnumber.cpp
} }
qtConfig(mainwindow) {
HEADERS += \
widgets/qmainwindow.h \
widgets/qmainwindowlayout_p.h
SOURCES += \
widgets/qmainwindow.cpp \
widgets/qmainwindowlayout.cpp
}
qtConfig(menubar) { qtConfig(menubar) {
HEADERS += \ HEADERS += \
widgets/qmenubar.h \ widgets/qmenubar.h \