Convert features.mdiarea to QT_[REQUIRE_]CONFIG
Change-Id: I6d2ec035a218869aa6595f5848de94ce491d3124 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
parent
79851be729
commit
10601aa7d2
@ -185,7 +185,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje
|
||||
} else if (classname == QLatin1String("QToolBox")) {
|
||||
iface = new QAccessibleToolBox(widget);
|
||||
#endif
|
||||
#ifndef QT_NO_MDIAREA
|
||||
#if QT_CONFIG(mdiarea)
|
||||
} else if (classname == QLatin1String("QMdiArea")) {
|
||||
iface = new QAccessibleMdiArea(widget);
|
||||
} else if (classname == QLatin1String("QMdiSubWindow")) {
|
||||
|
@ -58,8 +58,10 @@
|
||||
#if QT_CONFIG(toolbox)
|
||||
#include <QToolBox>
|
||||
#endif
|
||||
#if QT_CONFIG(mdiarea)
|
||||
#include <QMdiArea>
|
||||
#include <QMdiSubWindow>
|
||||
#endif
|
||||
#if QT_CONFIG(dialogbuttonbox)
|
||||
#include <QDialogButtonBox>
|
||||
#endif
|
||||
@ -377,7 +379,7 @@ QToolBox * QAccessibleToolBox::toolBox() const
|
||||
#endif // QT_CONFIG(toolbox)
|
||||
|
||||
// ======================= QAccessibleMdiArea ======================
|
||||
#ifndef QT_NO_MDIAREA
|
||||
#if QT_CONFIG(mdiarea)
|
||||
QAccessibleMdiArea::QAccessibleMdiArea(QWidget *widget)
|
||||
: QAccessibleWidget(widget, QAccessible::LayeredPane)
|
||||
{
|
||||
@ -497,7 +499,7 @@ QMdiSubWindow *QAccessibleMdiSubWindow::mdiSubWindow() const
|
||||
{
|
||||
return static_cast<QMdiSubWindow *>(object());
|
||||
}
|
||||
#endif // QT_NO_MDIAREA
|
||||
#endif // QT_CONFIG(mdiarea)
|
||||
|
||||
#if QT_CONFIG(dialogbuttonbox)
|
||||
// ======================= QAccessibleDialogButtonBox ======================
|
||||
|
@ -216,7 +216,7 @@ protected:
|
||||
QToolBox *toolBox() const;
|
||||
};
|
||||
|
||||
#ifndef QT_NO_MDIAREA
|
||||
#if QT_CONFIG(mdiarea)
|
||||
class QAccessibleMdiArea : public QAccessibleWidget
|
||||
{
|
||||
public:
|
||||
@ -246,7 +246,7 @@ public:
|
||||
protected:
|
||||
QMdiSubWindow *mdiSubWindow() const;
|
||||
};
|
||||
#endif // QT_NO_MDIAREA
|
||||
#endif // QT_CONFIG(mdiarea)
|
||||
|
||||
#if QT_CONFIG(dialogbuttonbox)
|
||||
class QAccessibleDialogButtonBox : public QAccessibleWidget
|
||||
|
@ -44,7 +44,9 @@
|
||||
#include <qpa/qplatformintegration.h>
|
||||
#include <QDebug>
|
||||
|
||||
#if QT_CONFIG(mdiarea)
|
||||
#include <QMdiSubWindow>
|
||||
#endif
|
||||
#include <QAbstractScrollArea>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
@ -98,7 +100,7 @@ public:
|
||||
QWidget *p = q->parentWidget();
|
||||
while (p) {
|
||||
if (false
|
||||
#ifndef QT_NO_MDIAREA
|
||||
#if QT_CONFIG(mdiarea)
|
||||
|| qobject_cast<QMdiSubWindow *>(p) != 0
|
||||
#endif
|
||||
#if QT_CONFIG(scrollarea)
|
||||
|
@ -3745,7 +3745,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl
|
||||
}
|
||||
break;
|
||||
#endif // QT_CONFIG(groupbox)
|
||||
#ifndef QT_NO_MDIAREA
|
||||
#if QT_CONFIG(mdiarea)
|
||||
case CC_MdiControls:
|
||||
{
|
||||
QStyleOptionButton btnOpt;
|
||||
@ -3808,7 +3808,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl
|
||||
}
|
||||
}
|
||||
break;
|
||||
#endif // QT_NO_MDIAREA
|
||||
#endif // QT_CONFIG(mdiarea)
|
||||
default:
|
||||
qWarning("QCommonStyle::drawComplexControl: Control %d not handled", cc);
|
||||
}
|
||||
@ -4339,7 +4339,7 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex
|
||||
break;
|
||||
}
|
||||
#endif // QT_CONFIG(groupbox)
|
||||
#ifndef QT_NO_MDIAREA
|
||||
#if QT_CONFIG(mdiarea)
|
||||
case CC_MdiControls:
|
||||
{
|
||||
int numSubControls = 0;
|
||||
@ -4382,7 +4382,7 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex
|
||||
ret = QRect(offset, 0, buttonWidth, opt->rect.height());
|
||||
break;
|
||||
}
|
||||
#endif // QT_NO_MDIAREA
|
||||
#endif // QT_CONFIG(mdiarea)
|
||||
default:
|
||||
qWarning("QCommonStyle::subControlRect: Case %d not handled", cc);
|
||||
}
|
||||
|
@ -77,7 +77,9 @@
|
||||
#if QT_CONFIG(mainwindow)
|
||||
#include <qmainwindow.h>
|
||||
#endif
|
||||
#if QT_CONFIG(mdiarea)
|
||||
#include <qmdisubwindow.h>
|
||||
#endif
|
||||
#if QT_CONFIG(menubar)
|
||||
#include <qmenubar.h>
|
||||
#endif
|
||||
@ -773,7 +775,7 @@ static QSize qt_aqua_get_known_size(QStyle::ContentsType ct, const QWidget *widg
|
||||
gbi.size = sz == QAquaSizeSmall ? kHIThemeGrowBoxSizeSmall : kHIThemeGrowBoxSizeNormal;
|
||||
if (HIThemeGetGrowBoxBounds(&p, &gbi, &r) == noErr) {
|
||||
int width = 0;
|
||||
#ifndef QT_NO_MDIAREA
|
||||
#if QT_CONFIG(mdiarea)
|
||||
if (widg && qobject_cast<QMdiSubWindow *>(widg->parentWidget()))
|
||||
width = r.size.width;
|
||||
#endif
|
||||
|
@ -91,7 +91,9 @@
|
||||
#if QT_CONFIG(dockwidget)
|
||||
#include <qdockwidget.h>
|
||||
#endif
|
||||
#if QT_CONFIG(mdiarea)
|
||||
#include <qmdisubwindow.h>
|
||||
#endif
|
||||
#if QT_CONFIG(dialog)
|
||||
#include <qdialog.h>
|
||||
#endif
|
||||
@ -2830,7 +2832,7 @@ void QStyleSheetStyle::polish(QWidget *w)
|
||||
#if QT_CONFIG(mainwindow)
|
||||
|| qobject_cast<QMainWindow *>(w)
|
||||
#endif
|
||||
#ifndef QT_NO_MDIAREA
|
||||
#if QT_CONFIG(mdiarea)
|
||||
|| qobject_cast<QMdiSubWindow *>(w)
|
||||
#endif
|
||||
#if QT_CONFIG(menubar)
|
||||
|
@ -3174,7 +3174,7 @@ void QWindowsXPStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCo
|
||||
}
|
||||
break;
|
||||
|
||||
#ifndef QT_NO_MDIAREA
|
||||
#if QT_CONFIG(mdiarea)
|
||||
case CC_MdiControls:
|
||||
{
|
||||
QRect buttonRect;
|
||||
@ -3230,7 +3230,7 @@ void QWindowsXPStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCo
|
||||
}
|
||||
}
|
||||
break;
|
||||
#endif //QT_NO_MDIAREA
|
||||
#endif // QT_CONFIG(mdiarea)
|
||||
#if QT_CONFIG(dial)
|
||||
case CC_Dial:
|
||||
if (const QStyleOptionSlider *dial = qstyleoption_cast<const QStyleOptionSlider *>(option))
|
||||
@ -3570,7 +3570,7 @@ QRect QWindowsXPStyle::subControlRect(ComplexControl cc, const QStyleOptionCompl
|
||||
}
|
||||
}
|
||||
break;
|
||||
#ifndef QT_NO_MDIAREA
|
||||
#if QT_CONFIG(mdiarea)
|
||||
case CC_MdiControls:
|
||||
{
|
||||
int numSubControls = 0;
|
||||
@ -3607,7 +3607,7 @@ QRect QWindowsXPStyle::subControlRect(ComplexControl cc, const QStyleOptionCompl
|
||||
rect = QRect(offset, 0, buttonWidth, option->rect.height());
|
||||
break;
|
||||
}
|
||||
#endif // QT_NO_MDIAREA
|
||||
#endif // QT_CONFIG(mdiarea)
|
||||
|
||||
default:
|
||||
rect = visualRect(option->direction, option->rect,
|
||||
|
@ -156,8 +156,6 @@
|
||||
|
||||
#include "qmdiarea_p.h"
|
||||
|
||||
#ifndef QT_NO_MDIAREA
|
||||
|
||||
#include <QApplication>
|
||||
#include <QStyle>
|
||||
#if 0 /* Used to be included in Qt4 for Q_WS_MAC */ && QT_CONFIG(style_mac)
|
||||
@ -2700,5 +2698,3 @@ void QMdiArea::setupViewport(QWidget *viewport)
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#include "moc_qmdiarea.cpp"
|
||||
|
||||
#endif // QT_NO_MDIAREA
|
||||
|
@ -46,11 +46,10 @@
|
||||
#include <QtWidgets/qtabwidget.h>
|
||||
#endif
|
||||
|
||||
QT_REQUIRE_CONFIG(mdiarea);
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
|
||||
#ifndef QT_NO_MDIAREA
|
||||
|
||||
class QMdiSubWindow;
|
||||
|
||||
class QMdiAreaPrivate;
|
||||
@ -171,5 +170,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QMdiArea::AreaOptions)
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QT_NO_MDIAREA
|
||||
#endif // QMDIAREA_H
|
||||
|
@ -55,7 +55,7 @@
|
||||
#include "qmdiarea.h"
|
||||
#include "qmdisubwindow.h"
|
||||
|
||||
#ifndef QT_NO_MDIAREA
|
||||
QT_REQUIRE_CONFIG(mdiarea);
|
||||
|
||||
#include <QList>
|
||||
#include <QVector>
|
||||
@ -266,8 +266,6 @@ public:
|
||||
#endif // QT_CONFIG(rubberband)
|
||||
};
|
||||
|
||||
#endif // QT_NO_MDIAREA
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QMDIAREA_P_H
|
||||
|
@ -147,8 +147,6 @@
|
||||
|
||||
#include "qmdisubwindow_p.h"
|
||||
|
||||
#ifndef QT_NO_MDIAREA
|
||||
|
||||
#include <QApplication>
|
||||
#include <QStylePainter>
|
||||
#include <QVBoxLayout>
|
||||
@ -3562,5 +3560,3 @@ QT_END_NAMESPACE
|
||||
|
||||
#include "moc_qmdisubwindow.cpp"
|
||||
#include "qmdisubwindow.moc"
|
||||
|
||||
#endif //QT_NO_MDIAREA
|
||||
|
@ -43,11 +43,10 @@
|
||||
#include <QtWidgets/qtwidgetsglobal.h>
|
||||
#include <QtWidgets/qwidget.h>
|
||||
|
||||
QT_REQUIRE_CONFIG(mdiarea);
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
|
||||
#ifndef QT_NO_MDIAREA
|
||||
|
||||
class QMenu;
|
||||
class QMdiArea;
|
||||
|
||||
@ -148,6 +147,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QMdiSubWindow::SubWindowOptions)
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QT_NO_MDIAREA
|
||||
|
||||
#endif // QMDISUBWINDOW_H
|
||||
|
@ -54,8 +54,6 @@
|
||||
#include <QtWidgets/private/qtwidgetsglobal_p.h>
|
||||
#include "qmdisubwindow.h"
|
||||
|
||||
#ifndef QT_NO_MDIAREA
|
||||
|
||||
#include <QStyle>
|
||||
#include <QStyleOptionTitleBar>
|
||||
#if QT_CONFIG(menubar)
|
||||
@ -66,6 +64,8 @@
|
||||
#include <QDebug>
|
||||
#include <private/qwidget_p.h>
|
||||
|
||||
QT_REQUIRE_CONFIG(mdiarea);
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
|
||||
class QVBoxLayout;
|
||||
@ -343,8 +343,6 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
#endif // QT_NO_MDIAREA
|
||||
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QMDISUBWINDOW_P_H
|
||||
|
@ -7,10 +7,6 @@ HEADERS += \
|
||||
widgets/qframe_p.h \
|
||||
widgets/qlineedit.h \
|
||||
widgets/qlineedit_p.h \
|
||||
widgets/qmdiarea.h \
|
||||
widgets/qmdiarea_p.h \
|
||||
widgets/qmdisubwindow.h \
|
||||
widgets/qmdisubwindow_p.h \
|
||||
widgets/qmenu.h \
|
||||
widgets/qmenu_p.h \
|
||||
widgets/qsizegrip.h \
|
||||
@ -36,8 +32,6 @@ SOURCES += \
|
||||
widgets/qframe.cpp \
|
||||
widgets/qlineedit_p.cpp \
|
||||
widgets/qlineedit.cpp \
|
||||
widgets/qmdiarea.cpp \
|
||||
widgets/qmdisubwindow.cpp \
|
||||
widgets/qmenu.cpp \
|
||||
widgets/qsizegrip.cpp \
|
||||
widgets/qslider.cpp \
|
||||
@ -183,6 +177,18 @@ qtConfig(mainwindow) {
|
||||
widgets/qmainwindowlayout.cpp
|
||||
}
|
||||
|
||||
qtConfig(mdiarea) {
|
||||
HEADERS += \
|
||||
widgets/qmdiarea.h \
|
||||
widgets/qmdiarea_p.h \
|
||||
widgets/qmdisubwindow.h \
|
||||
widgets/qmdisubwindow_p.h
|
||||
|
||||
SOURCES += \
|
||||
widgets/qmdiarea.cpp \
|
||||
widgets/qmdisubwindow.cpp
|
||||
}
|
||||
|
||||
qtConfig(menubar) {
|
||||
HEADERS += \
|
||||
widgets/qmenubar.h \
|
||||
|
Loading…
x
Reference in New Issue
Block a user