diff options
Diffstat (limited to 'src/widgets')
130 files changed, 480 insertions, 549 deletions
diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp index 5442c145a0..efbca0331d 100644 --- a/src/widgets/accessible/complexwidgets.cpp +++ b/src/widgets/accessible/complexwidgets.cpp @@ -61,7 +61,9 @@ #endif #include <QAbstractScrollArea> #include <QScrollArea> +#if QT_CONFIG(scrollbar) #include <QScrollBar> +#endif #include <QDebug> #ifndef QT_NO_ACCESSIBILITY diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index 3bc0f7e77b..e3dd7383b2 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -43,7 +43,9 @@ #include "qaction.h" #include "qapplication.h" +#if QT_CONFIG(groupbox) #include "qgroupbox.h" +#endif #if QT_CONFIG(label) #include "qlabel.h" #endif @@ -95,7 +97,7 @@ static QString buddyString(const QWidget *widget) } #endif -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) QGroupBox *groupbox = qobject_cast<QGroupBox*>(parent); if (groupbox) return groupbox->title(); @@ -331,7 +333,7 @@ QAccessibleWidget::relations(QAccessible::Relation match /*= QAccessible::AllRel } } #endif -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) QGroupBox *groupbox = qobject_cast<QGroupBox*>(parent); if (groupbox && !groupbox->title().isEmpty()) { QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(groupbox); diff --git a/src/widgets/accessible/qaccessiblewidgetfactory.cpp b/src/widgets/accessible/qaccessiblewidgetfactory.cpp index c3de7a7dd6..3fbc9714f5 100644 --- a/src/widgets/accessible/qaccessiblewidgetfactory.cpp +++ b/src/widgets/accessible/qaccessiblewidgetfactory.cpp @@ -47,7 +47,9 @@ #include "itemviews_p.h" #endif +#if QT_CONFIG(toolbutton) #include <qtoolbutton.h> +#endif #if QT_CONFIG(treeview) #include <qtreeview.h> #endif @@ -93,7 +95,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje } else if (classname == QLatin1String("QDoubleSpinBox")) { iface = new QAccessibleDoubleSpinBox(widget); #endif -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) } else if (classname == QLatin1String("QScrollBar")) { iface = new QAccessibleScrollBar(widget); #endif @@ -103,10 +105,10 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje } else if (classname == QLatin1String("QSlider")) { iface = new QAccessibleSlider(widget); #endif -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) } else if (classname == QLatin1String("QToolButton")) { iface = new QAccessibleToolButton(widget); -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) #if QT_CONFIG(abstractbutton) } else if (classname == QLatin1String("QCheckBox") || classname == QLatin1String("QRadioButton") @@ -124,13 +126,13 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje #endif } else if (classname == QLatin1String("QLabel") || classname == QLatin1String("QLCDNumber")) { iface = new QAccessibleDisplay(widget); -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) } else if (classname == QLatin1String("QGroupBox")) { iface = new QAccessibleGroupBox(widget); #endif } else if (classname == QLatin1String("QStatusBar")) { iface = new QAccessibleDisplay(widget); -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) } else if (classname == QLatin1String("QProgressBar")) { iface = new QAccessibleProgressBar(widget); #endif @@ -159,7 +161,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje #endif } else if (classname == QLatin1String("QSizeGrip")) { iface = new QAccessibleWidget(widget, QAccessible::Grip); -#ifndef QT_NO_SPLITTER +#if QT_CONFIG(splitter) } else if (classname == QLatin1String("QSplitter")) { iface = new QAccessibleWidget(widget, QAccessible::Splitter); } else if (classname == QLatin1String("QSplitterHandle")) { @@ -179,7 +181,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje } else if (classname == QLatin1String("QStackedWidget")) { iface = new QAccessibleStackedWidget(widget); #endif -#ifndef QT_NO_TOOLBOX +#if QT_CONFIG(toolbox) } else if (classname == QLatin1String("QToolBox")) { iface = new QAccessibleToolBox(widget); #endif @@ -193,7 +195,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje } else if (classname == QLatin1String("QDialogButtonBox")) { iface = new QAccessibleDialogButtonBox(widget); #endif -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) } else if (classname == QLatin1String("QDial")) { iface = new QAccessibleDial(widget); #endif @@ -201,7 +203,7 @@ QAccessibleInterface *qAccessibleFactory(const QString &classname, QObject *obje } else if (classname == QLatin1String("QRubberBand")) { iface = new QAccessibleWidget(widget, QAccessible::Border); #endif -#if !defined(QT_NO_TEXTBROWSER) && !defined(QT_NO_CURSOR) +#if QT_CONFIG(textbrowser) && !defined(QT_NO_CURSOR) } else if (classname == QLatin1String("QTextBrowser")) { iface = new QAccessibleTextBrowser(widget); #endif diff --git a/src/widgets/accessible/qaccessiblewidgets.cpp b/src/widgets/accessible/qaccessiblewidgets.cpp index e28833274e..4e7ba78620 100644 --- a/src/widgets/accessible/qaccessiblewidgets.cpp +++ b/src/widgets/accessible/qaccessiblewidgets.cpp @@ -47,11 +47,15 @@ #include "qtextobject.h" #include "qplaintextedit.h" #include "qtextboundaryfinder.h" +#if QT_CONFIG(scrollbar) #include "qscrollbar.h" +#endif #include "qdebug.h" #include <QApplication> #include <QStackedWidget> +#if QT_CONFIG(toolbox) #include <QToolBox> +#endif #include <QMdiArea> #include <QMdiSubWindow> #if QT_CONFIG(dialogbuttonbox) @@ -61,7 +65,9 @@ #if QT_CONFIG(rubberband) #include <QRubberBand> #endif +#if QT_CONFIG(textbrowser) #include <QTextBrowser> +#endif #if QT_CONFIG(calendarwidget) #include <QCalendarWidget> #endif @@ -352,7 +358,7 @@ QStackedWidget *QAccessibleStackedWidget::stackedWidget() const } #endif // QT_NO_STACKEDWIDGET -#ifndef QT_NO_TOOLBOX +#if QT_CONFIG(toolbox) // ======================= QAccessibleToolBox ====================== QAccessibleToolBox::QAccessibleToolBox(QWidget *widget) : QAccessibleWidget(widget, QAccessible::LayeredPane) @@ -364,7 +370,7 @@ QToolBox * QAccessibleToolBox::toolBox() const { return static_cast<QToolBox *>(object()); } -#endif // QT_NO_TOOLBOX +#endif // QT_CONFIG(toolbox) // ======================= QAccessibleMdiArea ====================== #ifndef QT_NO_MDIAREA @@ -499,7 +505,7 @@ QAccessibleDialogButtonBox::QAccessibleDialogButtonBox(QWidget *widget) #endif // QT_CONFIG(dialogbuttonbox) -#if !defined(QT_NO_TEXTBROWSER) && !defined(QT_NO_CURSOR) +#if QT_CONFIG(textbrowser) && !defined(QT_NO_CURSOR) QAccessibleTextBrowser::QAccessibleTextBrowser(QWidget *widget) : QAccessibleTextEdit(widget) { @@ -510,7 +516,7 @@ QAccessible::Role QAccessibleTextBrowser::role() const { return QAccessible::StaticText; } -#endif // QT_NO_TEXTBROWSER && QT_NO_CURSOR +#endif // QT_CONFIG(textbrowser) && QT_NO_CURSOR #if QT_CONFIG(calendarwidget) // ===================== QAccessibleCalendarWidget ======================== diff --git a/src/widgets/accessible/qaccessiblewidgets_p.h b/src/widgets/accessible/qaccessiblewidgets_p.h index 3ff67c0c9b..050930243d 100644 --- a/src/widgets/accessible/qaccessiblewidgets_p.h +++ b/src/widgets/accessible/qaccessiblewidgets_p.h @@ -256,7 +256,7 @@ public: }; #endif -#if !defined(QT_NO_TEXTBROWSER) && !defined(QT_NO_CURSOR) +#if QT_CONFIG(textbrowser) && !defined(QT_NO_CURSOR) class QAccessibleTextBrowser : public QAccessibleTextEdit { public: @@ -264,7 +264,7 @@ public: QAccessible::Role role() const Q_DECL_OVERRIDE; }; -#endif // QT_NO_TEXTBROWSER && QT_NO_CURSOR +#endif // QT_CONFIG(textbrowser) && QT_NO_CURSOR #if QT_CONFIG(calendarwidget) class QAccessibleCalendarWidget : public QAccessibleWidget diff --git a/src/widgets/accessible/rangecontrols.cpp b/src/widgets/accessible/rangecontrols.cpp index 602d0c7e11..c890c50938 100644 --- a/src/widgets/accessible/rangecontrols.cpp +++ b/src/widgets/accessible/rangecontrols.cpp @@ -40,15 +40,18 @@ #include "rangecontrols_p.h" #include <qslider.h> +#if QT_CONFIG(dial) #include <qdial.h> +#endif #include <qspinbox.h> +#if QT_CONFIG(scrollbar) #include <qscrollbar.h> +#endif #include <qstyle.h> #include <qstyleoption.h> #include <qdebug.h> #include <qglobal.h> #include <QDoubleSpinBox> -#include <QDial> #include <QtWidgets/qlineedit.h> #include <qmath.h> #include <private/qmath_p.h> @@ -284,7 +287,7 @@ QString QAccessibleDoubleSpinBox::text(QAccessible::Text textType) const #endif // QT_NO_SPINBOX -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) /*! \class QAccessibleScrollBar \brief The QAccessibleScrollBar class implements the QAccessibleInterface for scroll bars. @@ -317,7 +320,7 @@ QString QAccessibleScrollBar::text(QAccessible::Text t) const return QAccessibleAbstractSlider::text(t); } -#endif // QT_NO_SCROLLBAR +#endif // QT_CONFIG(scrollbar) #ifndef QT_NO_SLIDER /*! @@ -398,7 +401,7 @@ QAbstractSlider *QAccessibleAbstractSlider::abstractSlider() const #endif // QT_NO_SLIDER -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) // ======================================= QAccessibleDial ====================================== QAccessibleDial::QAccessibleDial(QWidget *widget) : QAccessibleAbstractSlider(widget, QAccessible::Dial) @@ -419,7 +422,7 @@ QDial *QAccessibleDial::dial() const { return static_cast<QDial*>(object()); } -#endif // QT_NO_DIAL +#endif // QT_CONFIG(dial) #endif // QT_NO_ACCESSIBILITY diff --git a/src/widgets/accessible/rangecontrols_p.h b/src/widgets/accessible/rangecontrols_p.h index c0b010c292..49f57fa1c6 100644 --- a/src/widgets/accessible/rangecontrols_p.h +++ b/src/widgets/accessible/rangecontrols_p.h @@ -162,7 +162,7 @@ protected: }; #endif // QT_CONFIG(slider) -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) class QAccessibleScrollBar : public QAccessibleAbstractSlider { public: @@ -172,7 +172,7 @@ public: protected: QScrollBar *scrollBar() const; }; -#endif // QT_NO_SCROLLBAR +#endif // QT_CONFIG(scrollbar) #ifndef QT_NO_SLIDER class QAccessibleSlider : public QAccessibleAbstractSlider @@ -186,7 +186,7 @@ protected: }; #endif // QT_NO_SLIDER -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) class QAccessibleDial : public QAccessibleAbstractSlider { public: @@ -197,7 +197,7 @@ public: protected: QDial *dial() const; }; -#endif // QT_NO_DIAL +#endif // QT_CONFIG(dial) #endif // QT_NO_ACCESSIBILITY diff --git a/src/widgets/accessible/simplewidgets.cpp b/src/widgets/accessible/simplewidgets.cpp index b8ce9a9060..b6fe003452 100644 --- a/src/widgets/accessible/simplewidgets.cpp +++ b/src/widgets/accessible/simplewidgets.cpp @@ -48,17 +48,25 @@ #if QT_CONFIG(pushbutton) #include <qpushbutton.h> #endif +#if QT_CONFIG(progressbar) #include <qprogressbar.h> +#endif +#if QT_CONFIG(statusbar) #include <qstatusbar.h> +#endif #if QT_CONFIG(radiobutton) #include <qradiobutton.h> #endif +#if QT_CONFIG(toolbutton) #include <qtoolbutton.h> +#endif #include <qmenu.h> #if QT_CONFIG(label) #include <qlabel.h> #endif +#if QT_CONFIG(groupbox) #include <qgroupbox.h> +#endif #if QT_CONFIG(lcdnumber) #include <qlcdnumber.h> #endif @@ -274,7 +282,7 @@ QStringList QAccessibleButton::keyBindingsForAction(const QString &actionName) c } #endif // QT_CONFIG(abstractbutton) -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) /*! \class QAccessibleToolButton \brief The QAccessibleToolButton class implements the QAccessibleInterface for tool buttons. @@ -394,7 +402,7 @@ void QAccessibleToolButton::doAction(const QString &actionName) } -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) /*! \class QAccessibleDisplay @@ -428,11 +436,11 @@ QAccessible::Role QAccessibleDisplay::role() const if (l->movie()) return QAccessible::Animation; #endif -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) } else if (qobject_cast<QProgressBar*>(object())) { return QAccessible::ProgressBar; #endif -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) } else if (qobject_cast<QStatusBar*>(object())) { return QAccessible::StatusBar; #endif @@ -474,7 +482,7 @@ QString QAccessibleDisplay::text(QAccessible::Text t) const else str = QString::number(l->intValue()); #endif -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) } else if (qobject_cast<QStatusBar*>(object())) { return qobject_cast<QStatusBar*>(object())->currentMessage(); #endif @@ -482,7 +490,7 @@ QString QAccessibleDisplay::text(QAccessible::Text t) const } break; case QAccessible::Value: -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) if (qobject_cast<QProgressBar*>(object())) str = QString::number(qobject_cast<QProgressBar*>(object())->value()); #endif @@ -562,7 +570,7 @@ QPoint QAccessibleDisplay::imagePosition() const #endif } -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) QAccessibleGroupBox::QAccessibleGroupBox(QWidget *w) : QAccessibleWidget(w) { @@ -889,7 +897,7 @@ void QAccessibleLineEdit::replaceText(int startOffset, int endOffset, const QStr #endif // QT_NO_LINEEDIT -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) QAccessibleProgressBar::QAccessibleProgressBar(QWidget *o) : QAccessibleDisplay(o) { diff --git a/src/widgets/accessible/simplewidgets_p.h b/src/widgets/accessible/simplewidgets_p.h index 1e4ae5ab67..c25aa31425 100644 --- a/src/widgets/accessible/simplewidgets_p.h +++ b/src/widgets/accessible/simplewidgets_p.h @@ -86,7 +86,7 @@ protected: }; #endif -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) class QAccessibleToolButton : public QAccessibleButton { public: @@ -107,7 +107,7 @@ protected: bool isSplitButton() const; }; -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) class QAccessibleDisplay : public QAccessibleWidget, public QAccessibleImageInterface { @@ -126,7 +126,7 @@ public: QPoint imagePosition() const Q_DECL_OVERRIDE; }; -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) class QAccessibleGroupBox : public QAccessibleWidget { public: @@ -190,7 +190,7 @@ protected: }; #endif // QT_NO_LINEEDIT -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) class QAccessibleProgressBar : public QAccessibleDisplay, public QAccessibleValueInterface { public: diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index 843a1bf341..6a55f62e53 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -55,7 +55,6 @@ #include <QtGui/qtextdocument.h> #include <QtWidgets/qapplication.h> #include <QtWidgets/qtextedit.h> -#include <QtWidgets/qtextbrowser.h> #include <QtWidgets/qmenu.h> #include "qdialog_p.h" #include <QtGui/qfont.h> diff --git a/src/widgets/graphicsview/qgraph_p.h b/src/widgets/graphicsview/qgraph_p.h index b42d4cf2e3..dfe9d8fdd3 100644 --- a/src/widgets/graphicsview/qgraph_p.h +++ b/src/widgets/graphicsview/qgraph_p.h @@ -61,6 +61,8 @@ #include <float.h> +QT_REQUIRE_CONFIG(graphicsview); + QT_BEGIN_NAMESPACE template <typename Vertex, typename EdgeData> diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout.cpp b/src/widgets/graphicsview/qgraphicsanchorlayout.cpp index 176ce694a0..ea6a8018ca 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout.cpp +++ b/src/widgets/graphicsview/qgraphicsanchorlayout.cpp @@ -135,7 +135,7 @@ */ #include "qgraphicsanchorlayout_p.h" -#ifndef QT_NO_GRAPHICSVIEW + QT_BEGIN_NAMESPACE QGraphicsAnchor::QGraphicsAnchor(QGraphicsAnchorLayout *parentLayout) @@ -531,5 +531,3 @@ QSizeF QGraphicsAnchorLayout::sizeHint(Qt::SizeHint which, const QSizeF &constra QT_END_NAMESPACE #include "moc_qgraphicsanchorlayout.cpp" - -#endif //QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout.h b/src/widgets/graphicsview/qgraphicsanchorlayout.h index 6d69957400..01dc30718a 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout.h +++ b/src/widgets/graphicsview/qgraphicsanchorlayout.h @@ -44,12 +44,10 @@ #include <QtWidgets/qgraphicsitem.h> #include <QtWidgets/qgraphicslayout.h> +QT_REQUIRE_CONFIG(graphicsview); QT_BEGIN_NAMESPACE - -#if !defined(QT_NO_GRAPHICSVIEW) - class QGraphicsAnchorPrivate; class QGraphicsAnchorLayout; class QGraphicsAnchorLayoutPrivate; @@ -115,8 +113,6 @@ private: friend class QGraphicsAnchor; }; -#endif - QT_END_NAMESPACE #endif diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp index 60e9039b4a..71027f00a2 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp +++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp @@ -50,7 +50,6 @@ #include <numeric> -#ifndef QT_NO_GRAPHICSVIEW QT_BEGIN_NAMESPACE // To ensure that all variables inside the simplex solver are non-negative, @@ -2976,4 +2975,3 @@ void QGraphicsAnchorLayoutPrivate::dumpGraph(const QString &name) #endif QT_END_NAMESPACE -#endif //QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h index 8da338dff7..e785b486bb 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h +++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h @@ -59,7 +59,9 @@ #include "qgraphicsanchorlayout.h" #include "qgraph_p.h" #include "qsimplex_p.h" -#ifndef QT_NO_GRAPHICSVIEW + +QT_REQUIRE_CONFIG(graphicsview); + QT_BEGIN_NAMESPACE /* @@ -591,6 +593,5 @@ public: }; QT_END_NAMESPACE -#endif //QT_NO_GRAPHICSVIEW #endif diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.cpp b/src/widgets/graphicsview/qgraphicsgridlayout.cpp index ae761d3478..d9005afbef 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayout.cpp +++ b/src/widgets/graphicsview/qgraphicsgridlayout.cpp @@ -79,8 +79,6 @@ #include "qglobal.h" -#ifndef QT_NO_GRAPHICSVIEW - #include "qapplication.h" #include "qwidget.h" #include "qgraphicslayout_p.h" @@ -694,5 +692,3 @@ QSizePolicy::ControlTypes QGraphicsGridLayout::controlTypes(LayoutSide side) con #endif QT_END_NAMESPACE - -#endif //QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.h b/src/widgets/graphicsview/qgraphicsgridlayout.h index c7c2edd2a2..fb9bc2e32c 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayout.h +++ b/src/widgets/graphicsview/qgraphicsgridlayout.h @@ -44,10 +44,9 @@ #include <QtWidgets/qgraphicsitem.h> #include <QtWidgets/qgraphicslayout.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(graphicsview); -#if !defined(QT_NO_GRAPHICSVIEW) +QT_BEGIN_NAMESPACE class QGraphicsGridLayoutPrivate; @@ -130,9 +129,6 @@ private: inline void QGraphicsGridLayout::addItem(QGraphicsLayoutItem *aitem, int arow, int acolumn, Qt::Alignment aalignment) { addItem(aitem, arow, acolumn, 1, 1, aalignment); } -#endif - QT_END_NAMESPACE #endif - diff --git a/src/widgets/graphicsview/qgraphicsgridlayoutengine.cpp b/src/widgets/graphicsview/qgraphicsgridlayoutengine.cpp index 4723e29c90..6a8d5c907b 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayoutengine.cpp +++ b/src/widgets/graphicsview/qgraphicsgridlayoutengine.cpp @@ -39,8 +39,6 @@ #include "qgraphicsgridlayoutengine_p.h" -#ifndef QT_NO_GRAPHICSVIEW - #include "qgraphicslayoutitem_p.h" #include "qgraphicslayout_p.h" #include "qgraphicswidget.h" @@ -118,7 +116,4 @@ int QGraphicsGridLayoutEngine::stretchFactor(QGraphicsLayoutItem *layoutItem, Qt return 0; } - QT_END_NAMESPACE - -#endif // QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h b/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h index a099dace6b..d797f784b8 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h +++ b/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h @@ -54,13 +54,13 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtGui/private/qgridlayoutengine_p.h> -#ifndef QT_NO_GRAPHICSVIEW - #include <QtWidgets/qsizepolicy.h> #include <QtWidgets/qstyle.h> #include <QtWidgets/qstyleoption.h> #include "qgraphicslayoutitem.h" +QT_REQUIRE_CONFIG(graphicsview); + QT_BEGIN_NAMESPACE class QGraphicsLayoutPrivate; @@ -138,6 +138,4 @@ public: QT_END_NAMESPACE -#endif // QT_NO_GRAPHICSVIEW - #endif // QGRAPHICSGRIDLAYOUTENGINE_P_H diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp index 239a110119..a649d61135 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -732,8 +732,6 @@ #include "qgraphicsitem.h" -#ifndef QT_NO_GRAPHICSVIEW - #include "qgraphicsscene.h" #include "qgraphicsscene_p.h" #include "qgraphicssceneevent.h" @@ -11635,5 +11633,3 @@ QDebug operator<<(QDebug debug, QGraphicsItem::GraphicsItemFlags flags) QT_END_NAMESPACE #include "moc_qgraphicsitem.cpp" - -#endif // QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h index 35e3d544e9..11d872f6e6 100644 --- a/src/widgets/graphicsview/qgraphicsitem.h +++ b/src/widgets/graphicsview/qgraphicsitem.h @@ -50,10 +50,9 @@ class tst_QGraphicsItem; -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(graphicsview); -#if !defined(QT_NO_GRAPHICSVIEW) +QT_BEGIN_NAMESPACE class QBrush; class QCursor; @@ -1050,8 +1049,6 @@ Q_DECLARE_METATYPE(QGraphicsItem *) QT_BEGIN_NAMESPACE -#endif // QT_NO_GRAPHICSVIEW - QT_END_NAMESPACE #endif // QGRAPHICSITEM_H diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h index 5c4523f9ed..86414263a7 100644 --- a/src/widgets/graphicsview/qgraphicsitem_p.h +++ b/src/widgets/graphicsview/qgraphicsitem_p.h @@ -61,7 +61,7 @@ #include <QtCore/qpoint.h> -#if !defined(QT_NO_GRAPHICSVIEW) +QT_REQUIRE_CONFIG(graphicsview); QT_BEGIN_NAMESPACE @@ -815,6 +815,4 @@ inline void QGraphicsItemPrivate::markParentDirty(bool updateBoundingRect) QT_END_NAMESPACE -#endif // QT_NO_GRAPHICSVIEW - #endif diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.cpp b/src/widgets/graphicsview/qgraphicsitemanimation.cpp index c5687ee9b3..572ec141bc 100644 --- a/src/widgets/graphicsview/qgraphicsitemanimation.cpp +++ b/src/widgets/graphicsview/qgraphicsitemanimation.cpp @@ -81,8 +81,6 @@ #include "qgraphicsitemanimation.h" -#ifndef QT_NO_GRAPHICSVIEW - #include "qgraphicsitem.h" #include <QtCore/qtimeline.h> @@ -595,5 +593,3 @@ void QGraphicsItemAnimation::afterAnimationStep(qreal step) QT_END_NAMESPACE #include "moc_qgraphicsitemanimation.cpp" - -#endif // QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.h b/src/widgets/graphicsview/qgraphicsitemanimation.h index f02e0ac793..a819acc880 100644 --- a/src/widgets/graphicsview/qgraphicsitemanimation.h +++ b/src/widgets/graphicsview/qgraphicsitemanimation.h @@ -43,11 +43,10 @@ #include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qobject.h> -#if !defined(QT_NO_GRAPHICSVIEW) +QT_REQUIRE_CONFIG(graphicsview); QT_BEGIN_NAMESPACE - class QGraphicsItem; class QMatrix; class QPointF; @@ -110,5 +109,4 @@ private: QT_END_NAMESPACE -#endif // QT_NO_GRAPHICSVIEW #endif diff --git a/src/widgets/graphicsview/qgraphicslayout.cpp b/src/widgets/graphicsview/qgraphicslayout.cpp index fc3b7ae503..ca0aef9e27 100644 --- a/src/widgets/graphicsview/qgraphicslayout.cpp +++ b/src/widgets/graphicsview/qgraphicslayout.cpp @@ -39,7 +39,6 @@ #include "qapplication.h" -#ifndef QT_NO_GRAPHICSVIEW #include "qgraphicslayout.h" #include "qgraphicslayout_p.h" #include "qgraphicslayoutitem.h" @@ -521,5 +520,3 @@ bool QGraphicsLayout::instantInvalidatePropagation() } QT_END_NAMESPACE - -#endif //QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicslayout.h b/src/widgets/graphicsview/qgraphicslayout.h index 5b1c465414..bbe45bbdd6 100644 --- a/src/widgets/graphicsview/qgraphicslayout.h +++ b/src/widgets/graphicsview/qgraphicslayout.h @@ -43,10 +43,9 @@ #include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qgraphicslayoutitem.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(graphicsview); -#if !defined(QT_NO_GRAPHICSVIEW) +QT_BEGIN_NAMESPACE class QGraphicsLayoutPrivate; class QGraphicsLayoutItem; @@ -86,9 +85,6 @@ private: Q_DECLARE_INTERFACE(QGraphicsLayout, "org.qt-project.Qt.QGraphicsLayout") -#endif - QT_END_NAMESPACE #endif - diff --git a/src/widgets/graphicsview/qgraphicslayout_p.cpp b/src/widgets/graphicsview/qgraphicslayout_p.cpp index c478dc2147..ae1eeffa2b 100644 --- a/src/widgets/graphicsview/qgraphicslayout_p.cpp +++ b/src/widgets/graphicsview/qgraphicslayout_p.cpp @@ -39,8 +39,6 @@ #include "qglobal.h" -#ifndef QT_NO_GRAPHICSVIEW - #include "qgraphicslayout_p.h" #include "qgraphicslayout.h" #include "qgraphicswidget.h" @@ -195,7 +193,4 @@ void QGraphicsLayoutPrivate::activateRecursive(QGraphicsLayoutItem *item) } } - QT_END_NAMESPACE - -#endif //QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicslayout_p.h b/src/widgets/graphicsview/qgraphicslayout_p.h index 47d8611786..302ad1e116 100644 --- a/src/widgets/graphicsview/qgraphicslayout_p.h +++ b/src/widgets/graphicsview/qgraphicslayout_p.h @@ -53,14 +53,14 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> -#if !defined(QT_NO_GRAPHICSVIEW) - #include "qgraphicslayout.h" #include "qgraphicslayoutitem_p.h" #include <QtWidgets/qstyle.h> #include <QtWidgets/qwidget.h> #include <QtWidgets/qstyleoption.h> +QT_REQUIRE_CONFIG(graphicsview); + QT_BEGIN_NAMESPACE class QGraphicsLayoutItem; @@ -144,9 +144,6 @@ public: bool activated; }; - QT_END_NAMESPACE -#endif //QT_NO_GRAPHICSVIEW - #endif diff --git a/src/widgets/graphicsview/qgraphicslayoutitem.cpp b/src/widgets/graphicsview/qgraphicslayoutitem.cpp index 785056a56f..9951fc0383 100644 --- a/src/widgets/graphicsview/qgraphicslayoutitem.cpp +++ b/src/widgets/graphicsview/qgraphicslayoutitem.cpp @@ -39,8 +39,6 @@ #include "qglobal.h" -#ifndef QT_NO_GRAPHICSVIEW - #include "qgraphicslayout.h" #include "qgraphicsscene.h" #include "qgraphicslayoutitem.h" @@ -930,5 +928,3 @@ void QGraphicsLayoutItem::setGraphicsItem(QGraphicsItem *item) } QT_END_NAMESPACE - -#endif //QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicslayoutitem.h b/src/widgets/graphicsview/qgraphicslayoutitem.h index 02bda0ad8d..10c7870412 100644 --- a/src/widgets/graphicsview/qgraphicslayoutitem.h +++ b/src/widgets/graphicsview/qgraphicslayoutitem.h @@ -45,10 +45,9 @@ #include <QtWidgets/qsizepolicy.h> #include <QtGui/qevent.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(graphicsview); -#if !defined(QT_NO_GRAPHICSVIEW) +QT_BEGIN_NAMESPACE class QGraphicsLayoutItemPrivate; class QGraphicsItem; @@ -141,8 +140,6 @@ inline qreal QGraphicsLayoutItem::maximumWidth() const inline qreal QGraphicsLayoutItem::maximumHeight() const { return effectiveSizeHint(Qt::MaximumSize).height(); } -#endif - QT_END_NAMESPACE #endif diff --git a/src/widgets/graphicsview/qgraphicslayoutitem_p.h b/src/widgets/graphicsview/qgraphicslayoutitem_p.h index 96e7cc7fd9..6aaa85381e 100644 --- a/src/widgets/graphicsview/qgraphicslayoutitem_p.h +++ b/src/widgets/graphicsview/qgraphicslayoutitem_p.h @@ -55,6 +55,8 @@ #include <QtCore/QSizeF> #include <QtWidgets/QSizePolicy> +QT_REQUIRE_CONFIG(graphicsview); + QT_BEGIN_NAMESPACE class QGraphicsLayoutItem; diff --git a/src/widgets/graphicsview/qgraphicslayoutstyleinfo.cpp b/src/widgets/graphicsview/qgraphicslayoutstyleinfo.cpp index 8d0ddde0bc..af969b346d 100644 --- a/src/widgets/graphicsview/qgraphicslayoutstyleinfo.cpp +++ b/src/widgets/graphicsview/qgraphicslayoutstyleinfo.cpp @@ -39,8 +39,6 @@ #include "qgraphicslayoutstyleinfo_p.h" -#ifndef QT_NO_GRAPHICSVIEW - #include "qgraphicslayout_p.h" #include "qgraphicswidget.h" #include <QtWidgets/qstyle.h> @@ -108,5 +106,3 @@ QStyle *QGraphicsLayoutStyleInfo::style() const } QT_END_NAMESPACE - -#endif // QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h b/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h index 9d3aa22548..3463ae71bf 100644 --- a/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h +++ b/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h @@ -54,6 +54,8 @@ #include <QtGui/private/qabstractlayoutstyleinfo_p.h> #include <QtWidgets/qstyleoption.h> +QT_REQUIRE_CONFIG(graphicsview); + QT_BEGIN_NAMESPACE class QStyle; diff --git a/src/widgets/graphicsview/qgraphicslinearlayout.cpp b/src/widgets/graphicsview/qgraphicslinearlayout.cpp index 6763af7905..8964b3b77a 100644 --- a/src/widgets/graphicsview/qgraphicslinearlayout.cpp +++ b/src/widgets/graphicsview/qgraphicslinearlayout.cpp @@ -113,8 +113,6 @@ #include "qapplication.h" -#ifndef QT_NO_GRAPHICSVIEW - #include "qwidget.h" #include "qgraphicslayout_p.h" #include "qgraphicslayoutitem.h" @@ -566,5 +564,3 @@ void QGraphicsLinearLayout::dump(int indent) const } QT_END_NAMESPACE - -#endif //QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicslinearlayout.h b/src/widgets/graphicsview/qgraphicslinearlayout.h index ebe8e903d9..8186eea987 100644 --- a/src/widgets/graphicsview/qgraphicslinearlayout.h +++ b/src/widgets/graphicsview/qgraphicslinearlayout.h @@ -44,10 +44,9 @@ #include <QtWidgets/qgraphicsitem.h> #include <QtWidgets/qgraphicslayout.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(graphicsview); -#if !defined(QT_NO_GRAPHICSVIEW) +QT_BEGIN_NAMESPACE class QGraphicsLinearLayoutPrivate; @@ -105,9 +104,6 @@ private: Q_DECLARE_PRIVATE(QGraphicsLinearLayout) }; -#endif - QT_END_NAMESPACE #endif - diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.cpp b/src/widgets/graphicsview/qgraphicsproxywidget.cpp index 5e692abd73..ebd245c4e7 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget.cpp +++ b/src/widgets/graphicsview/qgraphicsproxywidget.cpp @@ -39,8 +39,6 @@ #include "qglobal.h" -#ifndef QT_NO_GRAPHICSVIEW - #include "qgraphicslayout.h" #include "qgraphicsproxywidget.h" #include "private/qgraphicsproxywidget_p.h" @@ -1606,5 +1604,3 @@ QGraphicsProxyWidget *QGraphicsProxyWidget::newProxyWidget(const QWidget *) QT_END_NAMESPACE #include "moc_qgraphicsproxywidget.cpp" - -#endif //QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.h b/src/widgets/graphicsview/qgraphicsproxywidget.h index c1564cba34..fd6369a1fd 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget.h +++ b/src/widgets/graphicsview/qgraphicsproxywidget.h @@ -43,10 +43,9 @@ #include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qgraphicswidget.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(graphicsview); -#if !defined(QT_NO_GRAPHICSVIEW) +QT_BEGIN_NAMESPACE class QGraphicsProxyWidgetPrivate; @@ -133,9 +132,6 @@ private: friend class QGraphicsItem; }; -#endif - QT_END_NAMESPACE #endif - diff --git a/src/widgets/graphicsview/qgraphicsproxywidget_p.h b/src/widgets/graphicsview/qgraphicsproxywidget_p.h index 4624772993..593b686e0e 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget_p.h +++ b/src/widgets/graphicsview/qgraphicsproxywidget_p.h @@ -55,7 +55,7 @@ #include "qgraphicsproxywidget.h" #include "private/qgraphicswidget_p.h" -#if !defined(QT_NO_GRAPHICSVIEW) +QT_REQUIRE_CONFIG(graphicsview); QT_BEGIN_NAMESPACE @@ -114,5 +114,3 @@ public: QT_END_NAMESPACE #endif - -#endif diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp index db41fc3eb9..8b088e7c01 100644 --- a/src/widgets/graphicsview/qgraphicsscene.cpp +++ b/src/widgets/graphicsview/qgraphicsscene.cpp @@ -203,8 +203,6 @@ #include "qgraphicsscene.h" -#ifndef QT_NO_GRAPHICSVIEW - #include "qgraphicsitem.h" #include "qgraphicsitem_p.h" #include "qgraphicslayout.h" @@ -6585,5 +6583,3 @@ void QGraphicsScenePrivate::ungrabGesture(QGraphicsItem *item, Qt::GestureType g QT_END_NAMESPACE #include "moc_qgraphicsscene.cpp" - -#endif // QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h index b1846303f7..d515585067 100644 --- a/src/widgets/graphicsview/qgraphicsscene.h +++ b/src/widgets/graphicsview/qgraphicsscene.h @@ -50,10 +50,9 @@ #include <QtGui/qmatrix.h> #include <QtGui/qpen.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(graphicsview); -#if !defined(QT_NO_GRAPHICSVIEW) +QT_BEGIN_NAMESPACE template<typename T> class QList; class QFocusEvent; @@ -328,8 +327,6 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsScene::SceneLayers) -#endif // QT_NO_GRAPHICSVIEW - QT_END_NAMESPACE #endif diff --git a/src/widgets/graphicsview/qgraphicsscene_bsp.cpp b/src/widgets/graphicsview/qgraphicsscene_bsp.cpp index 77a3345d47..81d2953d8f 100644 --- a/src/widgets/graphicsview/qgraphicsscene_bsp.cpp +++ b/src/widgets/graphicsview/qgraphicsscene_bsp.cpp @@ -39,8 +39,6 @@ #include "qgraphicsscene_bsp_p.h" -#ifndef QT_NO_GRAPHICSVIEW - #include <QtCore/qstring.h> #include <private/qgraphicsitem_p.h> @@ -290,5 +288,3 @@ QRectF QGraphicsSceneBspTree::rectForIndex(int index) const } QT_END_NAMESPACE - -#endif // QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicsscene_bsp_p.h b/src/widgets/graphicsview/qgraphicsscene_bsp_p.h index 1ab9c10d6a..26e612b2dd 100644 --- a/src/widgets/graphicsview/qgraphicsscene_bsp_p.h +++ b/src/widgets/graphicsview/qgraphicsscene_bsp_p.h @@ -54,12 +54,12 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtCore/qlist.h> -#if !defined(QT_NO_GRAPHICSVIEW) - #include <QtCore/qrect.h> #include <QtCore/qset.h> #include <QtCore/qvector.h> +QT_REQUIRE_CONFIG(graphicsview); + QT_BEGIN_NAMESPACE class QGraphicsItem; @@ -126,6 +126,4 @@ public: QT_END_NAMESPACE -#endif // QT_NO_GRAPHICSVIEW - #endif // QGRAPHICSSCENEBSPTREE_P_H diff --git a/src/widgets/graphicsview/qgraphicsscene_p.h b/src/widgets/graphicsview/qgraphicsscene_p.h index c52770501f..2f5d7c54bb 100644 --- a/src/widgets/graphicsview/qgraphicsscene_p.h +++ b/src/widgets/graphicsview/qgraphicsscene_p.h @@ -54,8 +54,6 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qgraphicsscene.h" -#if !defined(QT_NO_GRAPHICSVIEW) - #include "qgraphicssceneevent.h" #include "qgraphicsview.h" #include "qgraphicsview_p.h" @@ -71,6 +69,8 @@ #include <QtWidgets/qstyle.h> #include <QtWidgets/qstyleoption.h> +QT_REQUIRE_CONFIG(graphicsview); + QT_BEGIN_NAMESPACE class QGraphicsSceneIndex; @@ -356,6 +356,4 @@ static inline QRectF adjustedItemEffectiveBoundingRect(const QGraphicsItem *item QT_END_NAMESPACE -#endif // QT_NO_GRAPHICSVIEW - #endif diff --git a/src/widgets/graphicsview/qgraphicsscenebsptreeindex.cpp b/src/widgets/graphicsview/qgraphicsscenebsptreeindex.cpp index 203cc8007c..69ddf54bc7 100644 --- a/src/widgets/graphicsview/qgraphicsscenebsptreeindex.cpp +++ b/src/widgets/graphicsview/qgraphicsscenebsptreeindex.cpp @@ -74,8 +74,6 @@ #include <QtCore/qglobal.h> -#ifndef QT_NO_GRAPHICSVIEW - #include <private/qgraphicsscene_p.h> #include <private/qgraphicsscenebsptreeindex_p.h> #include <private/qgraphicssceneindex_p.h> @@ -710,6 +708,3 @@ bool QGraphicsSceneBspTreeIndex::event(QEvent *event) QT_END_NAMESPACE #include "moc_qgraphicsscenebsptreeindex_p.cpp" - -#endif // QT_NO_GRAPHICSVIEW - diff --git a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h index b195a4757c..8e78407762 100644 --- a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h +++ b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h @@ -53,8 +53,6 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> -#if !defined(QT_NO_GRAPHICSVIEW) - #include "qgraphicssceneindex_p.h" #include "qgraphicsitem_p.h" #include "qgraphicsscene_bsp_p.h" @@ -62,6 +60,8 @@ #include <QtCore/qrect.h> #include <QtCore/qlist.h> +QT_REQUIRE_CONFIG(graphicsview); + QT_BEGIN_NAMESPACE static const int QGRAPHICSSCENE_INDEXTIMER_TIMEOUT = 2000; @@ -199,6 +199,4 @@ static inline bool QRectF_intersects(const QRectF &s, const QRectF &r) QT_END_NAMESPACE -#endif // QT_NO_GRAPHICSVIEW - #endif // QGRAPHICSBSPTREEINDEX_H diff --git a/src/widgets/graphicsview/qgraphicssceneevent.cpp b/src/widgets/graphicsview/qgraphicssceneevent.cpp index 763688191d..f7f09486e9 100644 --- a/src/widgets/graphicsview/qgraphicssceneevent.cpp +++ b/src/widgets/graphicsview/qgraphicssceneevent.cpp @@ -259,8 +259,6 @@ #include "qgraphicssceneevent.h" -#ifndef QT_NO_GRAPHICSVIEW - #ifndef QT_NO_DEBUG #include <QtCore/qdebug.h> #endif @@ -1733,5 +1731,3 @@ void QGraphicsSceneMoveEvent::setNewPos(const QPointF &pos) } QT_END_NAMESPACE - -#endif // QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicssceneevent.h b/src/widgets/graphicsview/qgraphicssceneevent.h index 4d6cde1b87..77b53e401d 100644 --- a/src/widgets/graphicsview/qgraphicssceneevent.h +++ b/src/widgets/graphicsview/qgraphicssceneevent.h @@ -51,10 +51,9 @@ #include <QtCore/qhash.h> #endif -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(graphicsview); -#if !defined(QT_NO_GRAPHICSVIEW) +QT_BEGIN_NAMESPACE class QMimeData; class QPointF; @@ -321,8 +320,6 @@ public: void setNewPos(const QPointF &pos); }; -#endif // QT_NO_GRAPHICSVIEW - QT_END_NAMESPACE #endif diff --git a/src/widgets/graphicsview/qgraphicssceneindex.cpp b/src/widgets/graphicsview/qgraphicssceneindex.cpp index a956a492ac..c2e9cb4729 100644 --- a/src/widgets/graphicsview/qgraphicssceneindex.cpp +++ b/src/widgets/graphicsview/qgraphicssceneindex.cpp @@ -61,8 +61,6 @@ #include "qgraphicssceneindex_p.h" #include "qgraphicsscenebsptreeindex_p.h" -#ifndef QT_NO_GRAPHICSVIEW - QT_BEGIN_NAMESPACE namespace QtPrivate { // just to keep indentation of the following functions at the same level @@ -627,5 +625,3 @@ void QGraphicsSceneIndex::prepareBoundingRectChange(const QGraphicsItem *item) QT_END_NAMESPACE #include "moc_qgraphicssceneindex_p.cpp" - -#endif // QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicssceneindex_p.h b/src/widgets/graphicsview/qgraphicssceneindex_p.h index 2085acd532..bdc57bd9ea 100644 --- a/src/widgets/graphicsview/qgraphicssceneindex_p.h +++ b/src/widgets/graphicsview/qgraphicssceneindex_p.h @@ -60,10 +60,9 @@ #include <QtCore/qobject.h> #include <QtGui/qtransform.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(graphicsview); -#if !defined(QT_NO_GRAPHICSVIEW) +QT_BEGIN_NAMESPACE class QGraphicsSceneIndexPrivate; class QPointF; @@ -156,8 +155,6 @@ inline void QGraphicsSceneIndexPrivate::items_helper(const QRectF &rect, QGraphi } } -#endif // QT_NO_GRAPHICSVIEW - QT_END_NAMESPACE #endif // QGRAPHICSSCENEINDEX_H diff --git a/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h index 47cba93fce..a59a8ac1b0 100644 --- a/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h +++ b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h @@ -53,15 +53,14 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> -#if !defined(QT_NO_GRAPHICSVIEW) - #include <QtCore/qrect.h> #include <QtCore/qlist.h> #include <QtWidgets/qgraphicsitem.h> #include <private/qgraphicssceneindex_p.h> -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(graphicsview); +QT_BEGIN_NAMESPACE class Q_AUTOTEST_EXPORT QGraphicsSceneLinearIndex : public QGraphicsSceneIndex { @@ -116,6 +115,4 @@ private: QT_END_NAMESPACE -#endif // QT_NO_GRAPHICSVIEW - #endif // QGRAPHICSSCENELINEARINDEX_H diff --git a/src/widgets/graphicsview/qgraphicstransform.cpp b/src/widgets/graphicsview/qgraphicstransform.cpp index db3f8b4a51..0f0d9aaddc 100644 --- a/src/widgets/graphicsview/qgraphicstransform.cpp +++ b/src/widgets/graphicsview/qgraphicstransform.cpp @@ -93,7 +93,6 @@ #include <QtCore/qmath.h> #include <QtCore/qnumeric.h> -#ifndef QT_NO_GRAPHICSVIEW QT_BEGIN_NAMESPACE QGraphicsTransformPrivate::~QGraphicsTransformPrivate() @@ -597,4 +596,3 @@ void QGraphicsRotation::applyTo(QMatrix4x4 *matrix) const #include "moc_qgraphicstransform.cpp" QT_END_NAMESPACE -#endif //QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicstransform.h b/src/widgets/graphicsview/qgraphicstransform.h index 6a76926725..ceeb314c86 100644 --- a/src/widgets/graphicsview/qgraphicstransform.h +++ b/src/widgets/graphicsview/qgraphicstransform.h @@ -46,9 +46,9 @@ #include <QtGui/QTransform> #include <QtGui/QMatrix4x4> -#ifndef QT_NO_GRAPHICSVIEW -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(graphicsview); +QT_BEGIN_NAMESPACE class QGraphicsItem; class QGraphicsTransformPrivate; @@ -149,6 +149,4 @@ private: QT_END_NAMESPACE -#endif //QT_NO_GRAPHICSVIEW - #endif // QFXTRANSFORM_H diff --git a/src/widgets/graphicsview/qgraphicstransform_p.h b/src/widgets/graphicsview/qgraphicstransform_p.h index 38dbd51c2e..e54ee9fb3c 100644 --- a/src/widgets/graphicsview/qgraphicstransform_p.h +++ b/src/widgets/graphicsview/qgraphicstransform_p.h @@ -54,7 +54,7 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qobject_p.h" -#ifndef QT_NO_GRAPHICSVIEW +QT_REQUIRE_CONFIG(graphicsview); QT_BEGIN_NAMESPACE @@ -77,6 +77,4 @@ public: QT_END_NAMESPACE -#endif //QT_NO_GRAPHICSVIEW - #endif // QGRAPHICSTRANSFORM_P_H diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp index a00156ef01..4b7890e9ff 100644 --- a/src/widgets/graphicsview/qgraphicsview.cpp +++ b/src/widgets/graphicsview/qgraphicsview.cpp @@ -271,8 +271,6 @@ static const int QGRAPHICSVIEW_PREALLOC_STYLE_OPTIONS = 503; // largest prime < #include "qgraphicsview.h" #include "qgraphicsview_p.h" -#ifndef QT_NO_GRAPHICSVIEW - #include "qgraphicsitem.h" #include "qgraphicsitem_p.h" #include "qgraphicsscene.h" @@ -3935,5 +3933,3 @@ QRectF QGraphicsViewPrivate::mapToScene(const QRectF &rect) const QT_END_NAMESPACE #include "moc_qgraphicsview.cpp" - -#endif // QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicsview.h b/src/widgets/graphicsview/qgraphicsview.h index d70ce6cf1c..a9e4efefaf 100644 --- a/src/widgets/graphicsview/qgraphicsview.h +++ b/src/widgets/graphicsview/qgraphicsview.h @@ -46,10 +46,9 @@ #include <QtWidgets/qscrollarea.h> #include <QtWidgets/qgraphicsscene.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(graphicsview); -#if !defined(QT_NO_GRAPHICSVIEW) +QT_BEGIN_NAMESPACE class QGraphicsItem; class QPainterPath; @@ -313,8 +312,6 @@ inline QPoint QGraphicsView::mapFromScene(qreal ax, qreal ay) const inline QPolygon QGraphicsView::mapFromScene(qreal ax, qreal ay, qreal w, qreal h) const { return mapFromScene(QRectF(ax, ay, w, h)); } -#endif // QT_NO_GRAPHICSVIEW - QT_END_NAMESPACE #endif // QGRAPHICSVIEW_H diff --git a/src/widgets/graphicsview/qgraphicsview_p.h b/src/widgets/graphicsview/qgraphicsview_p.h index b34be77f11..0428b9ce70 100644 --- a/src/widgets/graphicsview/qgraphicsview_p.h +++ b/src/widgets/graphicsview/qgraphicsview_p.h @@ -54,8 +54,6 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qgraphicsview.h" -#if !defined(QT_NO_GRAPHICSVIEW) - #include <QtGui/qevent.h> #include <QtCore/qcoreapplication.h> #include "qgraphicssceneevent.h" @@ -63,6 +61,8 @@ #include <private/qabstractscrollarea_p.h> #include <private/qapplication_p.h> +QT_REQUIRE_CONFIG(graphicsview); + QT_BEGIN_NAMESPACE class Q_WIDGETS_EXPORT QGraphicsViewPrivate : public QAbstractScrollAreaPrivate @@ -231,6 +231,4 @@ public: QT_END_NAMESPACE -#endif // QT_NO_GRAPHICSVIEW - #endif diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp index 1ff01b875c..c658e40a9e 100644 --- a/src/widgets/graphicsview/qgraphicswidget.cpp +++ b/src/widgets/graphicsview/qgraphicswidget.cpp @@ -39,8 +39,6 @@ #include "qglobal.h" -#ifndef QT_NO_GRAPHICSVIEW - #include "qgraphicswidget.h" #include "qgraphicswidget_p.h" #include "qgraphicslayout.h" @@ -2425,5 +2423,3 @@ void QGraphicsWidget::dumpFocusChain() QT_END_NAMESPACE #include "moc_qgraphicswidget.cpp" - -#endif //QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicswidget.h b/src/widgets/graphicsview/qgraphicswidget.h index 5cb97db381..831511d14a 100644 --- a/src/widgets/graphicsview/qgraphicswidget.h +++ b/src/widgets/graphicsview/qgraphicswidget.h @@ -46,8 +46,9 @@ #include <QtWidgets/qgraphicsitem.h> #include <QtGui/qpalette.h> -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(graphicsview); +QT_BEGIN_NAMESPACE class QFont; class QFontMetrics; @@ -58,8 +59,6 @@ class QGraphicsSceneResizeEvent; class QStyle; class QStyleOption; -#if !defined(QT_NO_GRAPHICSVIEW) - class QGraphicsWidgetPrivate; class Q_WIDGETS_EXPORT QGraphicsWidget : public QGraphicsObject, public QGraphicsLayoutItem @@ -239,8 +238,6 @@ private: inline void QGraphicsWidget::setGeometry(qreal ax, qreal ay, qreal aw, qreal ah) { setGeometry(QRectF(ax, ay, aw, ah)); } -#endif - QT_END_NAMESPACE #endif diff --git a/src/widgets/graphicsview/qgraphicswidget_p.cpp b/src/widgets/graphicsview/qgraphicswidget_p.cpp index f3c568fa01..c913e210b9 100644 --- a/src/widgets/graphicsview/qgraphicswidget_p.cpp +++ b/src/widgets/graphicsview/qgraphicswidget_p.cpp @@ -39,8 +39,6 @@ #include "qglobal.h" -#ifndef QT_NO_GRAPHICSVIEW - #include <QtCore/qdebug.h> #include <QtCore/qnumeric.h> #include "qgraphicswidget_p.h" @@ -897,5 +895,3 @@ void QGraphicsWidgetPrivate::setGeometryFromSetPos() } QT_END_NAMESPACE - -#endif //QT_NO_GRAPHICSVIEW diff --git a/src/widgets/graphicsview/qgraphicswidget_p.h b/src/widgets/graphicsview/qgraphicswidget_p.h index 18542c68e6..0fb9fbba07 100644 --- a/src/widgets/graphicsview/qgraphicswidget_p.h +++ b/src/widgets/graphicsview/qgraphicswidget_p.h @@ -60,13 +60,13 @@ #include <QtWidgets/qsizepolicy.h> #include <QtWidgets/qstyle.h> +QT_REQUIRE_CONFIG(graphicsview); + QT_BEGIN_NAMESPACE class QGraphicsLayout; class QStyleOptionTitleBar; -#if !defined(QT_NO_GRAPHICSVIEW) - class QGraphicsWidgetPrivate : public QGraphicsItemPrivate { Q_DECLARE_PUBLIC(QGraphicsWidget) @@ -201,8 +201,6 @@ public: #endif }; -#endif - QT_END_NAMESPACE #endif //QGRAPHICSWIDGET_P_H diff --git a/src/widgets/graphicsview/qsimplex_p.h b/src/widgets/graphicsview/qsimplex_p.h index 634b2e0425..2342da2437 100644 --- a/src/widgets/graphicsview/qsimplex_p.h +++ b/src/widgets/graphicsview/qsimplex_p.h @@ -56,6 +56,8 @@ #include <QtCore/qpair.h> #include <QtCore/qstring.h> +QT_REQUIRE_CONFIG(graphicsview); + QT_BEGIN_NAMESPACE struct QSimplexVariable diff --git a/src/widgets/kernel/qaction.cpp b/src/widgets/kernel/qaction.cpp index 57b1f31188..a7116b1462 100644 --- a/src/widgets/kernel/qaction.cpp +++ b/src/widgets/kernel/qaction.cpp @@ -114,7 +114,7 @@ void QActionPrivate::sendDataChanged() QWidget *w = widgets.at(i); QApplication::sendEvent(w, &e); } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) for (int i = 0; i < graphicsWidgets.size(); ++i) { QGraphicsWidget *w = graphicsWidgets.at(i); QApplication::sendEvent(w, &e); @@ -279,6 +279,8 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map) /*! Constructs an action with \a parent. If \a parent is an action group the action will be automatically inserted into the group. + + \note The \a parent argument is optional since Qt 5.7. */ QAction::QAction(QObject* parent) : QAction(*new QActionPrivate, parent) @@ -360,7 +362,7 @@ QList<QWidget *> QAction::associatedWidgets() const return d->widgets; } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) /*! \since 4.5 Returns a list of widgets this action has been added to. @@ -565,7 +567,7 @@ QAction::~QAction() QWidget *w = d->widgets.at(i); w->removeAction(this); } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) for (int i = d->graphicsWidgets.size()-1; i >= 0; --i) { QGraphicsWidget *w = d->graphicsWidgets.at(i); w->removeAction(this); diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h index d211016931..ca127ef51a 100644 --- a/src/widgets/kernel/qaction.h +++ b/src/widgets/kernel/qaction.h @@ -175,7 +175,7 @@ public: QWidget *parentWidget() const; QList<QWidget *> associatedWidgets() const; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) QList<QGraphicsWidget *> associatedGraphicsWidgets() const; // ### suboptimal #endif diff --git a/src/widgets/kernel/qaction_p.h b/src/widgets/kernel/qaction_p.h index 6813ca08f6..4c1537b63b 100644 --- a/src/widgets/kernel/qaction_p.h +++ b/src/widgets/kernel/qaction_p.h @@ -54,7 +54,9 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtWidgets/qaction.h" #include "QtWidgets/qmenu.h" +#if QT_CONFIG(graphicsview) #include "private/qgraphicswidget_p.h" +#endif #include "private/qobject_p.h" QT_BEGIN_NAMESPACE @@ -112,7 +114,7 @@ public: QAction::Priority priority; QList<QWidget *> widgets; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) QList<QGraphicsWidget *> graphicsWidgets; #endif #ifndef QT_NO_SHORTCUT diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 09162b9ab4..ee61a25b09 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -47,7 +47,10 @@ #include "qevent.h" #include "qfile.h" #include "qfileinfo.h" +#if QT_CONFIG(graphicsview) #include "qgraphicsscene.h" +#include <QtWidgets/qgraphicsproxywidget.h> +#endif #include "qhash.h" #include "qset.h" #include "qlayout.h" @@ -70,7 +73,6 @@ #include "qmessagebox.h" #endif #include "qwidgetwindow_p.h" -#include <QtWidgets/qgraphicsproxywidget.h> #include <QtGui/qstylehints.h> #include <QtGui/qinputmethod.h> #include <QtGui/private/qwindow_p.h> @@ -1443,13 +1445,13 @@ void QApplicationPrivate::setPalette_helper(const QPalette &palette, const char* } // Send to all scenes as well. -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) QList<QGraphicsScene *> &scenes = qApp->d_func()->scene_list; for (QList<QGraphicsScene *>::ConstIterator it = scenes.constBegin(); it != scenes.constEnd(); ++it) { QApplication::sendEvent(*it, &e); } -#endif //QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) } if (!className && (!QApplicationPrivate::sys_pal || !palette.isCopyOf(*QApplicationPrivate::sys_pal))) { if (!QApplicationPrivate::set_pal) @@ -1627,14 +1629,14 @@ void QApplication::setFont(const QFont &font, const char *className) sendEvent(w, &e); } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) // Send to all scenes as well. QList<QGraphicsScene *> &scenes = qApp->d_func()->scene_list; for (QList<QGraphicsScene *>::ConstIterator it = scenes.constBegin(); it != scenes.constEnd(); ++it) { QApplication::sendEvent(*it, &e); } -#endif //QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) } if (!className && (!QApplicationPrivate::sys_font || !font.isCopyOf(*QApplicationPrivate::sys_font))) { if (!QApplicationPrivate::set_font) @@ -1769,7 +1771,7 @@ QWidget *QApplication::focusWidget() void QApplicationPrivate::setFocusWidget(QWidget *focus, Qt::FocusReason reason) { -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (focus && focus->window()->graphicsProxyWidget()) return; #endif @@ -2076,7 +2078,7 @@ void QApplication::setActiveWindow(QWidget* act) if (QApplicationPrivate::active_window == window) return; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (window && window->graphicsProxyWidget()) { // Activate the proxy's view->viewport() ? return; @@ -2386,7 +2388,7 @@ void QApplicationPrivate::dispatchEnterLeave(QWidget* enter, QWidget* leave, con //check that we will not call qt_x11_enforce_cursor twice with the same native widget if (parentOfLeavingCursor && (!enterOnAlien || parentOfLeavingCursor->effectiveWinId() != enter->effectiveWinId())) { -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (!parentOfLeavingCursor->window()->graphicsProxyWidget()) #endif { @@ -2405,7 +2407,7 @@ void QApplicationPrivate::dispatchEnterLeave(QWidget* enter, QWidget* leave, con if (!cursorWidget) return; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (cursorWidget->window()->graphicsProxyWidget()) { QWidgetPrivate::nearestGraphicsProxyWidget(cursorWidget)->setCursor(cursorWidget->cursor()); } else @@ -3099,7 +3101,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) case QEvent::KeyRelease: { bool isWidget = receiver->isWidgetType(); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) const bool isGraphicsWidget = !isWidget && qobject_cast<QGraphicsWidget *>(receiver); #endif QKeyEvent* key = static_cast<QKeyEvent*>(e); @@ -3111,7 +3113,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) else key->ignore(); QWidget *w = isWidget ? static_cast<QWidget *>(receiver) : 0; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) QGraphicsWidget *gw = isGraphicsWidget ? static_cast<QGraphicsWidget *>(receiver) : 0; #endif res = d->notify_helper(receiver, e); @@ -3131,14 +3133,14 @@ bool QApplication::notify(QObject *receiver, QEvent *e) */ || !pr || (isWidget && (w->isWindow() || !w->parentWidget())) -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) || (isGraphicsWidget && (gw->isWindow() || !gw->parentWidget())) #endif ) { break; } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) receiver = w ? (QObject *)w->parentWidget() : (QObject *)gw->parentWidget(); #else receiver = w->parentWidget(); @@ -3431,7 +3433,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) case QEvent::DragEnter: { QWidget* w = static_cast<QWidget *>(receiver); QDragEnterEvent *dragEvent = static_cast<QDragEnterEvent *>(e); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) // QGraphicsProxyWidget handles its own propagation, // and we must not change QDragManagers currentTarget. QWExtra *extra = w->window()->d_func()->extra; @@ -3459,7 +3461,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) case QEvent::Drop: case QEvent::DragLeave: { QWidget* w = static_cast<QWidget *>(receiver); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) // QGraphicsProxyWidget handles its own propagation, // and we must not change QDragManagers currentTarget. QWExtra *extra = w->window()->d_func()->extra; @@ -3481,7 +3483,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) } res = d->notify_helper(w, e); if (e->type() != QEvent::DragMove -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) && !isProxyWidget #endif ) diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index 1bd114aad7..5dca2e85f1 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -165,7 +165,7 @@ public: static QWidget *focusNextPrevChild_helper(QWidget *toplevel, bool next, bool *wrappingOccurred = 0); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) // Maintain a list of all scenes to ensure font and palette propagation to // all scenes. QList<QGraphicsScene *> scene_list; diff --git a/src/widgets/kernel/qgesture.cpp b/src/widgets/kernel/qgesture.cpp index 3962cbe6c5..7f8bf18e90 100644 --- a/src/widgets/kernel/qgesture.cpp +++ b/src/widgets/kernel/qgesture.cpp @@ -40,7 +40,9 @@ #include "qgesture.h" #include "private/qgesture_p.h" #include "private/qstandardgestures_p.h" +#if QT_CONFIG(graphicsview) #include "qgraphicsview.h" +#endif #include <private/qdebug_p.h> #ifndef QT_NO_GESTURES @@ -1067,7 +1069,7 @@ QWidget *QGestureEvent::widget() const return m_widget; } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) /*! Returns the scene-local coordinates if the \a gesturePoint is inside a graphics view. @@ -1089,7 +1091,7 @@ QPointF QGestureEvent::mapToGraphicsScene(const QPointF &gesturePoint) const } return QPointF(); } -#endif //QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) #ifndef QT_NO_DEBUG_STREAM diff --git a/src/widgets/kernel/qgesture.h b/src/widgets/kernel/qgesture.h index 4dd6e82fd1..1eda611d64 100644 --- a/src/widgets/kernel/qgesture.h +++ b/src/widgets/kernel/qgesture.h @@ -301,7 +301,7 @@ public: void setWidget(QWidget *widget); QWidget *widget() const; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) QPointF mapToGraphicsScene(const QPointF &gesturePoint) const; #endif diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp index cfa4246455..fca36c7472 100644 --- a/src/widgets/kernel/qgesturemanager.cpp +++ b/src/widgets/kernel/qgesturemanager.cpp @@ -41,13 +41,15 @@ #include "private/qstandardgestures_p.h" #include "private/qwidget_p.h" #include "private/qgesture_p.h" +#if QT_CONFIG(graphicsview) #include "private/qgraphicsitem_p.h" +#include "qgraphicsitem.h" +#endif #include "private/qevent_p.h" #include "private/qapplication_p.h" #include "private/qwidgetwindow_p.h" #include "qgesture.h" #include "qevent.h" -#include "qgraphicsitem.h" #ifdef Q_OS_OSX #include "qmacgesturerecognizer_p.h" @@ -207,7 +209,7 @@ QGesture *QGestureManager::getState(QObject *object, QGestureRecognizer *recogni return 0; } else if (QGesture *g = qobject_cast<QGesture *>(object)) { return g; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) } else { Q_ASSERT(qobject_cast<QGraphicsObject *>(object)); QGraphicsObject *graphicsObject = static_cast<QGraphicsObject *>(object); @@ -510,7 +512,7 @@ bool QGestureManager::filterEvent(QWidget *receiver, QEvent *event) return contexts.isEmpty() ? false : filterEventThroughContexts(contexts, event); } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) bool QGestureManager::filterEvent(QGraphicsObject *receiver, QEvent *event) { QMap<Qt::GestureType, int> types; diff --git a/src/widgets/kernel/qgesturemanager_p.h b/src/widgets/kernel/qgesturemanager_p.h index ec51466a63..e57652afba 100644 --- a/src/widgets/kernel/qgesturemanager_p.h +++ b/src/widgets/kernel/qgesturemanager_p.h @@ -75,9 +75,9 @@ public: bool filterEvent(QWidget *receiver, QEvent *event); bool filterEvent(QObject *receiver, QEvent *event); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) bool filterEvent(QGraphicsObject *receiver, QEvent *event); -#endif //QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) static QGestureManager* instance(); // declared in qapplication.cpp static bool gesturePending(QObject *o); diff --git a/src/widgets/kernel/qshortcut.cpp b/src/widgets/kernel/qshortcut.cpp index a09cba0ddc..891cf563d6 100644 --- a/src/widgets/kernel/qshortcut.cpp +++ b/src/widgets/kernel/qshortcut.cpp @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE static bool correctWidgetContext(Qt::ShortcutContext context, QWidget *w, QWidget *active_window); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) static bool correctGraphicsWidgetContext(Qt::ShortcutContext context, QGraphicsWidget *w, QWidget *active_window); #endif #ifndef QT_NO_ACTION @@ -110,7 +110,7 @@ bool qWidgetShortcutContextMatcher(QObject *object, Qt::ShortcutContext context) return correctActionContext(context, a, active_window); #endif -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (QGraphicsWidget *gw = qobject_cast<QGraphicsWidget *>(object)) return correctGraphicsWidgetContext(context, gw, active_window); #endif @@ -168,7 +168,7 @@ static bool correctWidgetContext(Qt::ShortcutContext context, QWidget *w, QWidge // Below is Qt::WindowShortcut context QWidget *tlw = w->window(); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (QWExtra *topData = static_cast<QWidgetPrivate *>(QObjectPrivate::get(tlw))->extra) { if (topData->proxyWidget) { bool res = correctGraphicsWidgetContext(context, (QGraphicsWidget *)topData->proxyWidget, active_window); @@ -204,7 +204,7 @@ static bool correctWidgetContext(Qt::ShortcutContext context, QWidget *w, QWidge return true; } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) static bool correctGraphicsWidgetContext(Qt::ShortcutContext context, QGraphicsWidget *w, QWidget *active_window) { bool visible = w->isVisible(); @@ -298,7 +298,7 @@ static bool correctActionContext(Qt::ShortcutContext context, QAction *a, QWidge return true; } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) const QList<QGraphicsWidget *> &graphicsWidgets = static_cast<QActionPrivate *>(QObjectPrivate::get(a))->graphicsWidgets; #if defined(DEBUG_QSHORTCUTMAP) if (graphicsWidgets.isEmpty()) diff --git a/src/widgets/kernel/qstandardgestures.cpp b/src/widgets/kernel/qstandardgestures.cpp index 759c9864a6..8a95b12d89 100644 --- a/src/widgets/kernel/qstandardgestures.cpp +++ b/src/widgets/kernel/qstandardgestures.cpp @@ -43,7 +43,9 @@ #include "qevent.h" #include "qwidget.h" #include "qabstractscrollarea.h" +#if QT_CONFIG(graphicsview) #include <qgraphicssceneevent.h> +#endif #include "qdebug.h" #ifndef QT_NO_GESTURES @@ -511,7 +513,7 @@ QTapAndHoldGestureRecognizer::recognize(QGesture *state, QObject *object, enum { TapRadius = 40 }; switch (event->type()) { -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) case QEvent::GraphicsSceneMousePress: { const QGraphicsSceneMouseEvent *gsme = static_cast<const QGraphicsSceneMouseEvent *>(event); d->position = gsme->screenPos(); @@ -540,7 +542,7 @@ QTapAndHoldGestureRecognizer::recognize(QGesture *state, QObject *object, d->timerId = q->startTimer(QTapAndHoldGesturePrivate::Timeout); return QGestureRecognizer::MayBeGesture; // we don't show a sign of life until the timeout } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) case QEvent::GraphicsSceneMouseRelease: #endif case QEvent::MouseButtonRelease: @@ -563,7 +565,7 @@ QTapAndHoldGestureRecognizer::recognize(QGesture *state, QObject *object, return QGestureRecognizer::MayBeGesture; return QGestureRecognizer::CancelGesture; } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) case QEvent::GraphicsSceneMouseMove: { const QGraphicsSceneMouseEvent *gsme = static_cast<const QGraphicsSceneMouseEvent *>(event); QPoint delta = gsme->screenPos() - d->position.toPoint(); diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index c6b3e31747..2b4c70ed2b 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -97,9 +97,11 @@ #include <QtGui/private/qwindow_p.h> #include "qaction_p.h" #include "qlayout_p.h" +#if QT_CONFIG(graphicsview) #include "QtWidgets/qgraphicsproxywidget.h" #include "QtWidgets/qgraphicsscene.h" #include "private/qgraphicsproxywidget_p.h" +#endif #include "QtWidgets/qabstractscrollarea.h" #include "private/qabstractscrollarea_p.h" #include "private/qevent_p.h" @@ -1614,7 +1616,7 @@ QWidget::~QWidget() QT_TRY { -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) const QWidget* w = this; while (w->d_func()->extra && w->d_func()->extra->focus_proxy) w = w->d_func()->extra->focus_proxy; @@ -1801,7 +1803,7 @@ void QWidgetPrivate::createExtra() extra = new QWExtra; extra->glContext = 0; extra->topextra = 0; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) extra->proxyWidget = 0; #endif #ifndef QT_NO_CURSOR @@ -2017,12 +2019,12 @@ void QWidgetPrivate::propagatePaletteChange() { Q_Q(QWidget); // Propagate a new inherited mask to all children. -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (!q->parentWidget() && extra && extra->proxyWidget) { QGraphicsProxyWidget *p = extra->proxyWidget; inheritedPaletteResolveMask = p->d_func()->inheritedPaletteResolveMask | p->palette().resolve(); } else -#endif //QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) if (q->isWindow() && !q->testAttribute(Qt::WA_WindowPropagation)) { inheritedPaletteResolveMask = 0; } @@ -4025,7 +4027,7 @@ void QWidget::setMinimumSize(int minw, int minh) if (maximized) data->window_state = data->window_state | Qt::WindowMaximized; } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (d->extra) { if (d->extra->proxyWidget) d->extra->proxyWidget->setMinimumSize(minw, minh); @@ -4083,7 +4085,7 @@ void QWidget::setMaximumSize(int maxw, int maxh) setAttribute(Qt::WA_Resized, resized); //not a user resize } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (d->extra) { if (d->extra->proxyWidget) d->extra->proxyWidget->setMaximumSize(maxw, maxh); @@ -4601,9 +4603,9 @@ QPalette QWidgetPrivate::naturalWidgetPalette(uint inheritedMask) const QPalette naturalPalette = QApplication::palette(q); if ((!q->testAttribute(Qt::WA_StyleSheet) || useStyleSheetPropagationInWidgetStyles) && (!q->isWindow() || q->testAttribute(Qt::WA_WindowPropagation) -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) || (extra && extra->proxyWidget) -#endif //QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) )) { if (QWidget *p = q->parentWidget()) { if (!p->testAttribute(Qt::WA_StyleSheet) || useStyleSheetPropagationInWidgetStyles) { @@ -4616,13 +4618,13 @@ QPalette QWidgetPrivate::naturalWidgetPalette(uint inheritedMask) const } } } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) else if (extra && extra->proxyWidget) { QPalette inheritedPalette = extra->proxyWidget->palette(); inheritedPalette.resolve(inheritedMask); naturalPalette = inheritedPalette.resolve(naturalPalette); } -#endif //QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) } naturalPalette.resolve(0); return naturalPalette; @@ -4749,9 +4751,9 @@ QFont QWidgetPrivate::naturalWidgetFont(uint inheritedMask) const QFont naturalFont = QApplication::font(q); if ((!q->testAttribute(Qt::WA_StyleSheet) || useStyleSheetPropagationInWidgetStyles) && (!q->isWindow() || q->testAttribute(Qt::WA_WindowPropagation) -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) || (extra && extra->proxyWidget) -#endif //QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) )) { if (QWidget *p = q->parentWidget()) { if (!p->testAttribute(Qt::WA_StyleSheet) || useStyleSheetPropagationInWidgetStyles) { @@ -4766,7 +4768,7 @@ QFont QWidgetPrivate::naturalWidgetFont(uint inheritedMask) const } } } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) else if (extra && extra->proxyWidget) { if (inheritedMask != 0) { QFont inheritedFont = extra->proxyWidget->font(); @@ -4774,7 +4776,7 @@ QFont QWidgetPrivate::naturalWidgetFont(uint inheritedMask) const naturalFont = inheritedFont.resolve(naturalFont); } // else nothing to do (naturalFont = naturalFont) } -#endif //QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) } naturalFont.resolve(0); return naturalFont; @@ -4820,12 +4822,12 @@ void QWidgetPrivate::updateFont(const QFont &font) data.fnt.x11SetScreen(xinfo.screen()); #endif // Combine new mask with natural mask and propagate to children. -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (!q->parentWidget() && extra && extra->proxyWidget) { QGraphicsProxyWidget *p = extra->proxyWidget; inheritedFontResolveMask = p->d_func()->inheritedFontResolveMask | p->font().resolve(); } else -#endif //QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) if (q->isWindow() && !q->testAttribute(Qt::WA_WindowPropagation)) { inheritedFontResolveMask = 0; } @@ -5825,9 +5827,9 @@ void QWidgetPrivate::paintSiblingsRecursive(QPaintDevice *pdev, const QObjectLis } if (w->updatesEnabled() -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) && (!w->d_func()->extra || !w->d_func()->extra->proxyWidget) -#endif //QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) ) { QRegion wRegion(rgn); wRegion &= wd->effectiveRectFor(w->data->crect); @@ -5915,7 +5917,7 @@ QPixmap QWidgetEffectSourcePrivate::pixmap(Qt::CoordinateSystem system, QPoint * } #endif // QT_CONFIG(graphicseffect) -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) /*! \internal @@ -6466,13 +6468,13 @@ bool QWidget::hasFocus() const const QWidget* w = this; while (w->d_func()->extra && w->d_func()->extra->focus_proxy) w = w->d_func()->extra->focus_proxy; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (QWidget *window = w->window()) { QWExtra *e = window->d_func()->extra; if (e && e->proxyWidget && e->proxyWidget->hasFocus() && window->focusWidget() == w) return true; } -#endif // !QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) return (QApplication::focusWidget() == w); } @@ -6527,7 +6529,7 @@ void QWidget::setFocus(Qt::FocusReason reason) ) return; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) QWidget *previousProxyFocus = 0; if (QWExtra *topData = window()->d_func()->extra) { if (topData->proxyWidget && topData->proxyWidget->hasFocus()) { @@ -6540,7 +6542,7 @@ void QWidget::setFocus(Qt::FocusReason reason) } #endif -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) // Update proxy state if (QWExtra *topData = window()->d_func()->extra) { if (topData->proxyWidget && !topData->proxyWidget->hasFocus()) { @@ -6582,7 +6584,7 @@ void QWidget::setFocus(Qt::FocusReason reason) QAccessible::updateAccessibility(&event); } #endif -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (QWExtra *topData = window()->d_func()->extra) { if (topData->proxyWidget) { if (previousProxyFocus && previousProxyFocus != f) { @@ -6594,7 +6596,7 @@ void QWidget::setFocus(Qt::FocusReason reason) QApplication::sendEvent(that->style(), &event); } if (!isHidden()) { -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) // Update proxy state if (QWExtra *topData = window()->d_func()->extra) if (topData->proxyWidget && topData->proxyWidget->hasFocus()) @@ -6703,7 +6705,7 @@ void QWidget::clearFocus() emit extra->window->focusObjectChanged(extra->window->focusObject()); } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) QWExtra *topData = d_func()->extra; if (topData && topData->proxyWidget) topData->proxyWidget->clearFocus(); @@ -6775,7 +6777,7 @@ bool QWidget::focusNextPrevChild(bool next) bool isSubWindow = (windowType() == Qt::SubWindow); if (!isWindow() && !isSubWindow && p) return p->focusNextPrevChild(next); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) Q_D(QWidget); if (d->extra && d->extra->proxyWidget) return d->extra->proxyWidget->focusNextPrevChild(next); @@ -6869,7 +6871,7 @@ bool QWidget::isActiveWindow() const if(tlw == QApplication::activeWindow() || (isVisible() && (tlw->windowType() == Qt::Popup))) return true; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (QWExtra *tlwExtra = tlw->d_func()->extra) { if (isVisible() && tlwExtra->proxyWidget) return tlwExtra->proxyWidget->isActiveWindow(); @@ -7880,7 +7882,7 @@ void QWidgetPrivate::show_helper() const bool isWindow = q->isWindow(); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) bool isEmbedded = isWindow && q->graphicsProxyWidget() != Q_NULLPTR; #else bool isEmbedded = false; @@ -7904,7 +7906,7 @@ void QWidgetPrivate::show_helper() // Automatic embedding of child windows of widgets already embedded into // QGraphicsProxyWidget when they are shown the first time. -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (isWindow) { if (!isEmbedded && !bypassGraphicsProxyWidget(q)) { QGraphicsProxyWidget *ancestorProxy = nearestGraphicsProxyWidget(q->parentWidget()); @@ -7967,7 +7969,7 @@ void QWidgetPrivate::show_sys() q->setAttribute(Qt::WA_Mapped); // add our window the modal window list (native dialogs) if (window && q->isWindow() -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) && (!extra || !extra->proxyWidget) #endif && q->windowModality() != Qt::NonModal) { @@ -8041,7 +8043,7 @@ void QWidgetPrivate::hide_helper() Q_Q(QWidget); bool isEmbedded = false; -#if !defined QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) isEmbedded = q->isWindow() && !bypassGraphicsProxyWidget(q) && nearestGraphicsProxyWidget(q->parentWidget()) != 0; #else Q_UNUSED(isEmbedded); @@ -8105,7 +8107,7 @@ void QWidgetPrivate::hide_sys() q->setAttribute(Qt::WA_Mapped, false); // remove our window from the modal window list (native dialogs) if (window && q->isWindow() -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) && (!extra || !extra->proxyWidget) #endif && q->windowModality() != Qt::NonModal) { @@ -10224,7 +10226,7 @@ void QWidget::setSizePolicy(QSizePolicy policy) d->size_policy = policy; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (QWExtra *extra = d->extra) { if (extra->proxyWidget) extra->proxyWidget->setSizePolicy(policy); @@ -10655,7 +10657,7 @@ void QWidget::setParent(QWidget *parent, Qt::WindowFlags f) d->updateIsOpaque(); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) // Embed the widget into a proxy if the parent is embedded. // ### Doesn't handle reparenting out of an embedded widget. if (oldtlw->graphicsProxyWidget()) { @@ -10797,7 +10799,7 @@ void QWidget::scroll(int dx, int dy) if (dx == 0 && dy == 0) return; Q_D(QWidget); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (QGraphicsProxyWidget *proxy = QWidgetPrivate::nearestGraphicsProxyWidget(this)) { // Graphics View maintains its own dirty region as a list of rects; // until we can connect item updates directly to the view, we must @@ -10837,7 +10839,7 @@ void QWidget::scroll(int dx, int dy, const QRect &r) if (dx == 0 && dy == 0) return; Q_D(QWidget); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (QGraphicsProxyWidget *proxy = QWidgetPrivate::nearestGraphicsProxyWidget(this)) { // Graphics View maintains its own dirty region as a list of rects; // until we can connect item updates directly to the view, we must @@ -11416,7 +11418,7 @@ void QWidget::setWindowOpacity(qreal opacity) if (!testAttribute(Qt::WA_WState_Created)) return; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (QGraphicsProxyWidget *proxy = graphicsProxyWidget()) { // Avoid invalidating the cache if set. if (proxy->cacheMode() == QGraphicsItem::NoCache) @@ -12283,7 +12285,7 @@ Q_WIDGETS_EXPORT QWidgetPrivate *qt_widget_private(QWidget *widget) } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) /*! \since 4.5 @@ -12433,7 +12435,7 @@ static inline bool canMapPosition(QWindow *window) return window->handle() && !qt_window_private(window)->resizeEventPending; } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) static inline QGraphicsProxyWidget *graphicsProxyWidget(const QWidget *w) { QGraphicsProxyWidget *result = Q_NULLPTR; @@ -12442,7 +12444,7 @@ static inline QGraphicsProxyWidget *graphicsProxyWidget(const QWidget *w) result = d->extra->proxyWidget; return result; } -#endif // !QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) struct MapToGlobalTransformResult { QTransform transform; @@ -12454,7 +12456,7 @@ static MapToGlobalTransformResult mapToGlobalTransform(const QWidget *w) MapToGlobalTransformResult result; result.window = Q_NULLPTR; for ( ; w ; w = w->parentWidget()) { -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (QGraphicsProxyWidget *qgpw = graphicsProxyWidget(w)) { if (const QGraphicsScene *scene = qgpw->scene()) { const QList <QGraphicsView *> views = scene->views(); @@ -12465,7 +12467,7 @@ static MapToGlobalTransformResult mapToGlobalTransform(const QWidget *w) } } } -#endif // !QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) QWindow *window = w->windowHandle(); if (window && canMapPosition(window)) { result.window = window; diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index 3b0678d349..732af4de09 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -451,7 +451,7 @@ public: inline bool updatesEnabled() const; void setUpdatesEnabled(bool enable); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) QGraphicsProxyWidget *graphicsProxyWidget() const; #endif diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 85214e4bd7..f1eefd68dd 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -67,9 +67,11 @@ #if QT_CONFIG(graphicseffect) #include <private/qgraphicseffect_p.h> #endif +#if QT_CONFIG(graphicsview) #include "QtWidgets/qgraphicsproxywidget.h" #include "QtWidgets/qgraphicsscene.h" #include "QtWidgets/qgraphicsview.h" +#endif #include <private/qgesture_p.h> #include <qpa/qplatformbackingstore.h> @@ -233,7 +235,7 @@ struct QWExtra { // Regular pointers (keep them together to avoid gaps on 64 bits architectures). void *glContext; // if the widget is hijacked by QGLWindowSurface QTLWExtra *topextra; // only useful for TLWs -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) QGraphicsProxyWidget *proxyWidget; // if the widget is embedded #endif #ifndef QT_NO_CURSOR @@ -406,7 +408,7 @@ public: const QRegion &rgn, const QPoint &offset, int flags, QPainter *sharedPainter, QWidgetBackingStore *backingStore); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) static QGraphicsProxyWidget * nearestGraphicsProxyWidget(const QWidget *origin); #endif void repaint_sys(const QRegion &rgn); @@ -534,7 +536,7 @@ public: static QRect screenGeometry(const QWidget *widget) { QRect screen; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) QGraphicsProxyWidget *ancestorProxy = widget->d_func()->nearestGraphicsProxyWidget(widget); //It's embedded if it has an ancestor if (ancestorProxy) { diff --git a/src/widgets/kernel/qwidgetbackingstore.cpp b/src/widgets/kernel/qwidgetbackingstore.cpp index 046bf743ab..bb421927db 100644 --- a/src/widgets/kernel/qwidgetbackingstore.cpp +++ b/src/widgets/kernel/qwidgetbackingstore.cpp @@ -48,7 +48,9 @@ #include <QtGui/qevent.h> #include <QtWidgets/qapplication.h> #include <QtGui/qpaintengine.h> +#if QT_CONFIG(graphicsview) #include <QtWidgets/qgraphicsproxywidget.h> +#endif #include <private/qwidget_p.h> #include <private/qapplication_p.h> @@ -821,7 +823,7 @@ void QWidgetPrivate::moveRect(const QRect &rect, int dx, int dy) const bool nativeWithTextureChild = textureChildSeen && q->internalWinId(); bool accelerateMove = accelEnv && isOpaque && !nativeWithTextureChild -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) // No accelerate move for proxy widgets. && !tlw->d_func()->extra->proxyWidget #endif @@ -1235,7 +1237,7 @@ void QWidgetBackingStore::doSync() : wd->dirty); toClean += widgetDirty; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (tlw->d_func()->extra->proxyWidget) { resetWidget(w); continue; @@ -1320,7 +1322,7 @@ void QWidgetBackingStore::doSync() dirtyRenderToTextureWidgets.clear(); #endif -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (tlw->d_func()->extra->proxyWidget) { updateStaticContentsSize(); dirty = QRegion(); diff --git a/src/widgets/statemachine/qguistatemachine.cpp b/src/widgets/statemachine/qguistatemachine.cpp index 543011b754..b452c63551 100644 --- a/src/widgets/statemachine/qguistatemachine.cpp +++ b/src/widgets/statemachine/qguistatemachine.cpp @@ -40,7 +40,10 @@ #include <QtCore/qstatemachine.h> #include <private/qstatemachine_p.h> #include <QtGui/qevent.h> +#include <QtWidgets/qtwidgetsglobal.h> +#if QT_CONFIG(graphicsview) #include <QtWidgets/qgraphicssceneevent.h> +#endif QT_BEGIN_NAMESPACE @@ -285,7 +288,7 @@ static QEvent *cloneEvent(QEvent *e) case QEvent::ZeroTimerEvent: Q_ASSERT_X(false, "cloneEvent()", "not implemented"); break; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) case QEvent::GraphicsSceneMouseMove: case QEvent::GraphicsSceneMousePress: case QEvent::GraphicsSceneMouseRelease: @@ -396,7 +399,7 @@ static QEvent *cloneEvent(QEvent *e) case QEvent::FutureCallOut: Q_ASSERT_X(false, "cloneEvent()", "not implemented"); break; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) case QEvent::GraphicsSceneResize: { QGraphicsSceneResizeEvent *re = static_cast<QGraphicsSceneResizeEvent*>(e); QGraphicsSceneResizeEvent *re2 = new QGraphicsSceneResizeEvent(); diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index c15703ca58..5167e59019 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -61,7 +61,9 @@ #else #include <qlayout.h> #endif +#if QT_CONFIG(groupbox) #include <qgroupbox.h> +#endif #include <qmath.h> #include <qmenu.h> #include <qpainter.h> @@ -76,7 +78,9 @@ #include <qtabwidget.h> #endif #include <qtoolbar.h> +#if QT_CONFIG(toolbutton) #include <qtoolbutton.h> +#endif #if QT_CONFIG(rubberband) #include <qrubberband.h> #endif @@ -288,7 +292,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q case PE_PanelToolBar: break; #endif // QT_NO_TOOLBAR -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) case PE_IndicatorProgressChunk: { bool vertical = false; @@ -303,7 +307,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q } } break; -#endif // QT_NO_PROGRESSBAR +#endif // QT_CONFIG(progressbar) case PE_IndicatorBranch: { static const int decoration_size = 9; int mid_h = opt->rect.x() + opt->rect.width() / 2; @@ -441,7 +445,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q case PE_FrameLineEdit: proxy()->drawPrimitive(PE_Frame, opt, p, widget); break; -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) case PE_FrameGroupBox: if (const QStyleOptionFrame *frame = qstyleoption_cast<const QStyleOptionFrame *>(opt)) { if (frame->features & QStyleOptionFrame::Flat) { @@ -457,7 +461,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q } } break; -#endif // QT_NO_GROUPBOX +#endif // QT_CONFIG(groupbox) #if QT_CONFIG(dockwidget) case PE_FrameDockWidget: if (const QStyleOptionFrame *frame = qstyleoption_cast<const QStyleOptionFrame *>(opt)) { @@ -805,7 +809,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q } } -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) static void drawArrow(const QStyle *style, const QStyleOptionToolButton *toolbutton, const QRect &rect, QPainter *painter, const QWidget *widget = 0) { @@ -830,7 +834,7 @@ static void drawArrow(const QStyle *style, const QStyleOptionToolButton *toolbut arrowOpt.rect = rect; style->drawPrimitive(pe, &arrowOpt, painter, widget); } -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) #if QT_CONFIG(itemviews) @@ -1414,7 +1418,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, p->eraseRect(opt->rect); break; #endif // QT_NO_MENUBAR -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) case CE_ProgressBar: if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(opt)) { @@ -1551,7 +1555,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, } } break; -#endif // QT_NO_PROGRESSBAR +#endif // QT_CONFIG(progressbar) case CE_HeaderLabel: if (const QStyleOptionHeader *header = qstyleoption_cast<const QStyleOptionHeader *>(opt)) { QRect rect = header->rect; @@ -1582,7 +1586,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, (header->state & State_Enabled), header->text, QPalette::ButtonText); } break; -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) case CE_ToolButtonLabel: if (const QStyleOptionToolButton *toolbutton = qstyleoption_cast<const QStyleOptionToolButton *>(opt)) { @@ -1666,8 +1670,8 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, } } break; -#endif // QT_NO_TOOLBUTTON -#ifndef QT_NO_TOOLBOX +#endif // QT_CONFIG(toolbutton) +#if QT_CONFIG(toolbox) case CE_ToolBoxTab: if (const QStyleOptionToolBox *tb = qstyleoption_cast<const QStyleOptionToolBox *>(opt)) { proxy()->drawControl(CE_ToolBoxTabShape, tb, p, widget); @@ -1719,7 +1723,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, p->setBrush(Qt::NoBrush); } break; -#endif // QT_NO_TOOLBOX +#endif // QT_CONFIG(toolbox) #if QT_CONFIG(tabbar) case CE_TabBarTab: if (const QStyleOptionTab *tab = qstyleoption_cast<const QStyleOptionTab *>(opt)) { @@ -2487,7 +2491,7 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt, } break; #endif // QT_NO_SLIDER -#ifndef QT_NO_PROGRESSBAR +#if QT_CONFIG(progressbar) case SE_ProgressBarGroove: case SE_ProgressBarContents: case SE_ProgressBarLabel: @@ -2512,7 +2516,7 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt, r = visualRect(pb->direction, pb->rect, r); } break; -#endif // QT_NO_PROGRESSBAR +#endif // QT_CONFIG(progressbar) #if QT_CONFIG(combobox) case SE_ComboBoxFocusRect: if (const QStyleOptionComboBox *cb = qstyleoption_cast<const QStyleOptionComboBox *>(opt)) { @@ -2523,12 +2527,12 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt, } break; #endif // QT_CONFIG(combobox) -#ifndef QT_NO_TOOLBOX +#if QT_CONFIG(toolbox) case SE_ToolBoxTabContents: r = opt->rect; r.adjust(0, 0, -30, 0); break; -#endif // QT_NO_TOOLBOX +#endif // QT_CONFIG(toolbox) case SE_HeaderLabel: { int margin = proxy()->pixelMetric(QStyle::PM_HeaderMargin, opt, widget); r.setRect(opt->rect.x() + margin, opt->rect.y() + margin, @@ -3084,7 +3088,7 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt, #endif } -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) // in lieu of std::array, minimal API template <int N> @@ -3132,7 +3136,7 @@ static StaticPolygonF<3> calcArrow(const QStyleOptionSlider *dial, qreal &a) return arrow; } -#endif // QT_NO_DIAL +#endif // QT_CONFIG(dial) /*! \reimp @@ -3198,7 +3202,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl } break; #endif // QT_NO_SLIDER -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) case CC_ScrollBar: if (const QStyleOptionSlider *scrollbar = qstyleoption_cast<const QStyleOptionSlider *>(opt)) { // Make a copy here and reset it for each primitive. @@ -3285,7 +3289,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl } } break; -#endif // QT_NO_SCROLLBAR +#endif // QT_CONFIG(scrollbar) #ifndef QT_NO_SPINBOX case CC_SpinBox: if (const QStyleOptionSpinBox *sb = qstyleoption_cast<const QStyleOptionSpinBox *>(opt)) { @@ -3351,7 +3355,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl } break; #endif // QT_NO_SPINBOX -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) case CC_ToolButton: if (const QStyleOptionToolButton *toolbutton = qstyleoption_cast<const QStyleOptionToolButton *>(opt)) { @@ -3412,7 +3416,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl } } break; -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) case CC_TitleBar: if (const QStyleOptionTitleBar *tb = qstyleoption_cast<const QStyleOptionTitleBar *>(opt)) { QRect ir; @@ -3590,7 +3594,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl } } break; -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) case CC_Dial: if (const QStyleOptionSlider *dial = qstyleoption_cast<const QStyleOptionSlider *>(opt)) { // OK, this is more a port of things over @@ -3683,8 +3687,8 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl p->restore(); } break; -#endif // QT_NO_DIAL -#ifndef QT_NO_GROUPBOX +#endif // QT_CONFIG(dial) +#if QT_CONFIG(groupbox) case CC_GroupBox: if (const QStyleOptionGroupBox *groupBox = qstyleoption_cast<const QStyleOptionGroupBox *>(opt)) { // Draw frame @@ -3745,7 +3749,7 @@ void QCommonStyle::drawComplexControl(ComplexControl cc, const QStyleOptionCompl } } break; -#endif // QT_NO_GROUPBOX +#endif // QT_CONFIG(groupbox) #ifndef QT_NO_MDIAREA case CC_MdiControls: { @@ -3837,7 +3841,7 @@ QStyle::SubControl QCommonStyle::hitTestComplexControl(ComplexControl cc, const } break; #endif // QT_NO_SLIDER -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) case CC_ScrollBar: if (const QStyleOptionSlider *scrollbar = qstyleoption_cast<const QStyleOptionSlider *>(opt)) { QRect r; @@ -3852,8 +3856,8 @@ QStyle::SubControl QCommonStyle::hitTestComplexControl(ComplexControl cc, const } } break; -#endif // QT_NO_SCROLLBAR -#ifndef QT_NO_TOOLBUTTON +#endif // QT_CONFIG(scrollbar) +#if QT_CONFIG(toolbutton) case CC_ToolButton: if (const QStyleOptionToolButton *toolbutton = qstyleoption_cast<const QStyleOptionToolButton *>(opt)) { QRect r; @@ -3868,7 +3872,7 @@ QStyle::SubControl QCommonStyle::hitTestComplexControl(ComplexControl cc, const } } break; -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) #ifndef QT_NO_SPINBOX case CC_SpinBox: if (const QStyleOptionSpinBox *spinbox = qstyleoption_cast<const QStyleOptionSpinBox *>(opt)) { @@ -3916,7 +3920,7 @@ QStyle::SubControl QCommonStyle::hitTestComplexControl(ComplexControl cc, const } break; #endif // QT_CONFIG(combobox) -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) case CC_GroupBox: if (const QStyleOptionGroupBox *groupBox = qstyleoption_cast<const QStyleOptionGroupBox *>(opt)) { QRect r; @@ -3931,7 +3935,7 @@ QStyle::SubControl QCommonStyle::hitTestComplexControl(ComplexControl cc, const } } break; -#endif // QT_NO_GROUPBOX +#endif // QT_CONFIG(groupbox) case CC_MdiControls: { QRect r; @@ -3996,7 +4000,7 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex } break; #endif // QT_NO_SLIDER -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) case CC_ScrollBar: if (const QStyleOptionSlider *scrollbar = qstyleoption_cast<const QStyleOptionSlider *>(opt)) { const QRect scrollBarRect = scrollbar->rect; @@ -4080,7 +4084,7 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex ret = visualRect(scrollbar->direction, scrollBarRect, ret); } break; -#endif // QT_NO_SCROLLBAR +#endif // QT_CONFIG(scrollbar) #ifndef QT_NO_SPINBOX case CC_SpinBox: if (const QStyleOptionSpinBox *spinbox = qstyleoption_cast<const QStyleOptionSpinBox *>(opt)) { @@ -4123,7 +4127,7 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex } break; #endif // Qt_NO_SPINBOX -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) case CC_ToolButton: if (const QStyleOptionToolButton *tb = qstyleoption_cast<const QStyleOptionToolButton *>(opt)) { int mbi = proxy()->pixelMetric(PM_MenuButtonIndicator, tb, widget); @@ -4147,7 +4151,7 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex ret = visualRect(tb->direction, tb->rect, ret); } break; -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) #if QT_CONFIG(combobox) case CC_ComboBox: if (const QStyleOptionComboBox *cb = qstyleoption_cast<const QStyleOptionComboBox *>(opt)) { @@ -4263,7 +4267,7 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex ret = visualRect(tb->direction, tb->rect, ret); } break; -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) case CC_GroupBox: { if (const QStyleOptionGroupBox *groupBox = qstyleoption_cast<const QStyleOptionGroupBox *>(opt)) { switch (sc) { @@ -4339,7 +4343,7 @@ QRect QCommonStyle::subControlRect(ComplexControl cc, const QStyleOptionComplex } break; } -#endif // QT_NO_GROUPBOX +#endif // QT_CONFIG(groupbox) #ifndef QT_NO_MDIAREA case CC_MdiControls: { @@ -4482,7 +4486,7 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid ret = int(QStyleHelper::dpiScaled(196.)); break; -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) case PM_ScrollBarExtent: if (const QStyleOptionSlider *sb = qstyleoption_cast<const QStyleOptionSlider *>(opt)) { int s = sb->orientation == Qt::Horizontal ? @@ -4842,11 +4846,11 @@ QSize QCommonStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt, } break; #endif // QT_NO_MENU -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) case CT_ToolButton: sz = QSize(sz.width() + 6, sz.height() + 5); break; -#endif // QT_NO_TOOLBUTTON +#endif // QT_CONFIG(toolbutton) #if QT_CONFIG(combobox) case CT_ComboBox: if (const QStyleOptionComboBox *cmb = qstyleoption_cast<const QStyleOptionComboBox *>(opt)) { @@ -4883,12 +4887,12 @@ QSize QCommonStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt, if (const QStyleOptionFrame *f = qstyleoption_cast<const QStyleOptionFrame *>(opt)) sz += QSize(2*f->lineWidth, 2*f->lineWidth); break; -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) case CT_GroupBox: if (const QGroupBox *grb = static_cast<const QGroupBox *>(widget)) sz += QSize(!grb->isFlat() ? 16 : 0, 0); break; -#endif // QT_NO_GROUPBOX +#endif // QT_CONFIG(groupbox) case CT_MdiControls: if (const QStyleOptionComplex *styleOpt = qstyleoption_cast<const QStyleOptionComplex *>(opt)) { const int buttonSize = proxy()->pixelMetric(PM_TitleBarButtonSize, styleOpt, widget); @@ -4968,7 +4972,7 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget ret = QDialogButtonBox::AcceptRole; break; #endif -#ifndef QT_NO_GROUPBOX +#if QT_CONFIG(groupbox) case SH_GroupBox_TextLabelVerticalAlignment: ret = Qt::AlignVCenter; break; @@ -4976,7 +4980,7 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget case SH_GroupBox_TextLabelColor: ret = opt ? int(opt->palette.color(QPalette::Text).rgba()) : 0; break; -#endif // QT_NO_GROUPBOX +#endif // QT_CONFIG(groupbox) case SH_ListViewExpand_SelectMouseType: case SH_TabBar_SelectMouseType: diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index c1b240a381..f20ffb0f92 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -57,16 +57,24 @@ #include <qapplication.h> #include <qmainwindow.h> #include <qfont.h> +#if QT_CONFIG(groupbox) #include <qgroupbox.h> +#endif #include <qpixmapcache.h> +#if QT_CONFIG(scrollbar) #include <qscrollbar.h> +#endif #include <qspinbox.h> #if QT_CONFIG(abstractslider) #include <qabstractslider.h> #endif #include <qslider.h> +#if QT_CONFIG(splitter) #include <qsplitter.h> +#endif +#if QT_CONFIG(progressbar) #include <qprogressbar.h> +#endif #if QT_CONFIG(wizard) #include <qwizard.h> #endif diff --git a/src/widgets/styles/qpixmapstyle.cpp b/src/widgets/styles/qpixmapstyle.cpp index 63308a5e36..975ebfcdbf 100644 --- a/src/widgets/styles/qpixmapstyle.cpp +++ b/src/widgets/styles/qpixmapstyle.cpp @@ -49,7 +49,9 @@ #include <QPixmapCache> #include <QStyleOption> #include <QString> +#if QT_CONFIG(progressbar) #include <QProgressBar> +#endif #include <QSlider> #include <QEvent> #if QT_CONFIG(combobox) @@ -63,8 +65,9 @@ #include <QListView> #endif #include <QAbstractScrollArea> +#if QT_CONFIG(scrollbar) #include <QScrollBar> - +#endif #if QT_CONFIG(scroller) #include <qscroller.h> #endif diff --git a/src/widgets/styles/qstylehelper.cpp b/src/widgets/styles/qstylehelper.cpp index 6a5a27ed6d..94376a63e3 100644 --- a/src/widgets/styles/qstylehelper.cpp +++ b/src/widgets/styles/qstylehelper.cpp @@ -43,7 +43,9 @@ #include <private/qmath_p.h> #include <private/qstyle_p.h> #include <qmath.h> +#if QT_CONFIG(scrollbar) #include <qscrollbar.h> +#endif #include <qabstractscrollarea.h> #include <qwindow.h> @@ -131,7 +133,7 @@ bool hasAncestor(QObject *obj, QAccessible::Role role) #endif // QT_NO_ACCESSIBILITY -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) int calcBigLineSize(int radius) { @@ -350,7 +352,7 @@ void drawDial(const QStyleOptionSlider *option, QPainter *painter) painter->drawEllipse(dialRect); painter->restore(); } -#endif //QT_NO_DIAL +#endif //QT_CONFIG(dial) void drawBorderPixmap(const QPixmap &pixmap, QPainter *painter, const QRect &rect, int left, int top, int right, diff --git a/src/widgets/styles/qstylehelper_p.h b/src/widgets/styles/qstylehelper_p.h index 777ad95470..bd263cea7b 100644 --- a/src/widgets/styles/qstylehelper_p.h +++ b/src/widgets/styles/qstylehelper_p.h @@ -76,12 +76,12 @@ namespace QStyleHelper { QString uniqueName(const QString &key, const QStyleOption *option, const QSize &size); Q_WIDGETS_EXPORT qreal dpiScaled(qreal value); -#ifndef QT_NO_DIAL +#if QT_CONFIG(dial) qreal angle(const QPointF &p1, const QPointF &p2); QPolygonF calcLines(const QStyleOptionSlider *dial); int calcBigLineSize(int radius); Q_WIDGETS_EXPORT void drawDial(const QStyleOptionSlider *dial, QPainter *painter); -#endif //QT_NO_DIAL +#endif //QT_CONFIG(dial) Q_WIDGETS_EXPORT void drawBorderPixmap(const QPixmap &pixmap, QPainter *painter, const QRect &rect, int left = 0, int top = 0, int right = 0, int bottom = 0); diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index b42876d72e..fa964a09b8 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -60,8 +60,12 @@ #include "private/qabstractscrollarea_p.h" #include <qtooltip.h> #include <qshareddata.h> +#if QT_CONFIG(toolbutton) #include <qtoolbutton.h> +#endif +#if QT_CONFIG(scrollbar) #include <qscrollbar.h> +#endif #if QT_CONFIG(abstractslider) #include <qabstractslider.h> #endif @@ -70,7 +74,6 @@ #if QT_CONFIG(checkbox) #include <qcheckbox.h> #endif -#include <qstatusbar.h> #if QT_CONFIG(itemviews) #include <qheaderview.h> #endif @@ -1985,7 +1988,7 @@ QRenderRule QStyleSheetStyle::renderRule(const QObject *obj, const QStyleOption extraClass |= PseudoClass_OnlyOne; } #endif // QT_NO_TOOLBAR -#ifndef QT_NO_TOOLBOX +#if QT_CONFIG(toolbox) else if (const QStyleOptionToolBox *tb = qstyleoption_cast<const QStyleOptionToolBox *>(opt)) { if (tb->position == QStyleOptionToolBox::OnlyOneTab) extraClass |= PseudoClass_OnlyOne; @@ -2001,7 +2004,7 @@ QRenderRule QStyleSheetStyle::renderRule(const QObject *obj, const QStyleOption else if (tb->selectedPosition == QStyleOptionToolBox::PreviousIsSelected) extraClass |= PseudoClass_PreviousSelected; } -#endif // QT_NO_TOOLBOX +#endif // QT_CONFIG(toolbox) #if QT_CONFIG(dockwidget) else if (const QStyleOptionDockWidget *dw = qstyleoption_cast<const QStyleOptionDockWidget *>(opt)) { if (dw->verticalTitleBar) @@ -3201,7 +3204,7 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC } break; -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) case CC_ScrollBar: if (const QStyleOptionSlider *sb = qstyleoption_cast<const QStyleOptionSlider *>(opt)) { QStyleOptionSlider sbOpt(*sb); @@ -3216,7 +3219,7 @@ void QStyleSheetStyle::drawComplexControl(ComplexControl cc, const QStyleOptionC return; } break; -#endif // QT_NO_SCROLLBAR +#endif // QT_CONFIG(scrollbar) #ifndef QT_NO_SLIDER case CC_Slider: @@ -4639,7 +4642,7 @@ int QStyleSheetStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const switch (m) { case PM_MenuButtonIndicator: -#ifndef QT_NO_TOOLBUTTON +#if QT_CONFIG(toolbutton) // QToolButton adds this directly to the width if (qobject_cast<const QToolButton *>(w) && (rule.hasBox() || !rule.hasNativeBorder())) return 0; @@ -4763,7 +4766,7 @@ int QStyleSheetStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const return subRule.box()->spacing; break; -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) case PM_ScrollBarExtent: if (rule.hasContentsSize()) { QSize sz = rule.size(); @@ -4787,7 +4790,7 @@ int QStyleSheetStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const if(!rule.hasNativeBorder() || rule.hasBox()) return 0; break; -#endif // QT_NO_SCROLLBAR +#endif // QT_CONFIG(scrollbar) case PM_ProgressBarChunkWidth: subRule = renderRule(w, opt, PseudoElement_ProgressBarChunk); @@ -5530,7 +5533,7 @@ QRect QStyleSheetStyle::subControlRect(ComplexControl cc, const QStyleOptionComp } break; -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) case CC_ScrollBar: if (const QStyleOptionSlider *sb = qstyleoption_cast<const QStyleOptionSlider *>(opt)) { QStyleOptionSlider styleOptionSlider(*sb); @@ -5612,7 +5615,7 @@ QRect QStyleSheetStyle::subControlRect(ComplexControl cc, const QStyleOptionComp : QWindowsStyle::subControlRect(cc, &styleOptionSlider, sc, w); } break; -#endif // QT_NO_SCROLLBAR +#endif // QT_CONFIG(scrollbar) #ifndef QT_NO_SLIDER case CC_Slider: diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp index 63f7cd43ef..818c3ea07e 100644 --- a/src/widgets/styles/qwindowsstyle.cpp +++ b/src/widgets/styles/qwindowsstyle.cpp @@ -1494,12 +1494,12 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai opt->state & (State_Sunken | State_On), 1, &opt->palette.brush(QPalette::Button)); break; -#ifndef QT_NO_SPLITTER +#if QT_CONFIG(splitter) case CE_Splitter: p->eraseRect(opt->rect); break; -#endif // QT_NO_SPLITTER -#ifndef QT_NO_SCROLLBAR +#endif // QT_CONFIG(splitter) +#if QT_CONFIG(scrollbar) case CE_ScrollBarSubLine: case CE_ScrollBarAddLine: { if ((opt->state & State_Sunken)) { @@ -1586,7 +1586,7 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai qDrawWinButton(p, opt->rect, pal, false, &opt->palette.brush(QPalette::Button)); } break; -#endif // QT_NO_SCROLLBAR +#endif // QT_CONFIG(scrollbar) case CE_HeaderSection: { QBrush fill; if (opt->state & State_On) @@ -2143,7 +2143,7 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp } break; #endif // QT_NO_SLIDER -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) case CC_ScrollBar: if (const QStyleOptionSlider *scrollbar = qstyleoption_cast<const QStyleOptionSlider *>(opt)) { QStyleOptionSlider newScrollbar = *scrollbar; @@ -2152,7 +2152,7 @@ void QWindowsStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComp QCommonStyle::drawComplexControl(cc, &newScrollbar, p, widget); } break; -#endif // QT_NO_SCROLLBAR +#endif // QT_CONFIG(scrollbar) #if QT_CONFIG(combobox) case CC_ComboBox: if (const QStyleOptionComboBox *cmb = qstyleoption_cast<const QStyleOptionComboBox *>(opt)) { diff --git a/src/widgets/util/qflickgesture.cpp b/src/widgets/util/qflickgesture.cpp index 71c4458b79..549b130c9d 100644 --- a/src/widgets/util/qflickgesture.cpp +++ b/src/widgets/util/qflickgesture.cpp @@ -41,10 +41,12 @@ #include "qapplication.h" #include "qevent.h" #include "qwidget.h" +#if QT_CONFIG(graphicsview) #include "qgraphicsitem.h" #include "qgraphicsscene.h" #include "qgraphicssceneevent.h" #include "qgraphicsview.h" +#endif #include "qscroller.h" #include <QtGui/qtouchdevice.h> #include "private/qapplication_p.h" @@ -77,7 +79,7 @@ static QMouseEvent *copyMouseEvent(QEvent *e) me->button(), me->buttons(), me->modifiers(), me->source()); return cme; } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) case QEvent::GraphicsSceneMousePress: case QEvent::GraphicsSceneMouseRelease: case QEvent::GraphicsSceneMouseMove: { @@ -110,7 +112,7 @@ static QMouseEvent *copyMouseEvent(QEvent *e) return copy; #endif } -#endif // QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) default: return 0; } @@ -275,7 +277,7 @@ protected: if (mouseTarget) { sendingEvent = true; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) QGraphicsItem *grabber = 0; if (mouseTarget->parentWidget()) { if (QGraphicsView *gv = qobject_cast<QGraphicsView *>(mouseTarget->parentWidget())) { @@ -294,7 +296,7 @@ protected: } #else Q_UNUSED(flags); -#endif // QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) if (me) { QMouseEvent copy(me->type(), mouseTarget->mapFromGlobal(me->globalPos()), @@ -303,7 +305,7 @@ protected: qt_sendSpontaneousEvent(mouseTarget, ©); } -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (grabber && (flags & RegrabMouseAfterwards)) { // GraphicsView Mouse Handling Workaround #2: // we need to re-grab the mouse after sending a faked mouse @@ -376,7 +378,7 @@ QFlickGestureRecognizer::QFlickGestureRecognizer(Qt::MouseButton button) */ QGesture *QFlickGestureRecognizer::create(QObject *target) { -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) QGraphicsObject *go = qobject_cast<QGraphicsObject*>(target); if (go && button == Qt::NoButton) { go->setAcceptTouchEvents(true); @@ -410,7 +412,7 @@ QGestureRecognizer::Result QFlickGestureRecognizer::recognize(QGesture *state, return Ignore; // nothing to do without a scroller? QWidget *receiverWidget = qobject_cast<QWidget *>(d->receiver); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) QGraphicsObject *receiverGraphicsObject = qobject_cast<QGraphicsObject *>(d->receiver); #endif @@ -421,7 +423,7 @@ QGestureRecognizer::Result QFlickGestureRecognizer::recognize(QGesture *state, } const QMouseEvent *me = 0; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) const QGraphicsSceneMouseEvent *gsme = 0; #endif const QTouchEvent *te = 0; @@ -440,7 +442,7 @@ QGestureRecognizer::Result QFlickGestureRecognizer::recognize(QGesture *state, globalPos = me->globalPos(); } break; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) case QEvent::GraphicsSceneMousePress: case QEvent::GraphicsSceneMouseRelease: case QEvent::GraphicsSceneMouseMove: @@ -494,7 +496,7 @@ QGestureRecognizer::Result QFlickGestureRecognizer::recognize(QGesture *state, } if (!me -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) && !gsme #endif && !te) // Neither mouse nor touch @@ -527,7 +529,7 @@ QGestureRecognizer::Result QFlickGestureRecognizer::recognize(QGesture *state, } break; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) case QEvent::GraphicsSceneMousePress: if (gsme && gsme->button() == button && gsme->buttons() == button) { point = gsme->scenePos(); @@ -590,7 +592,7 @@ QGestureRecognizer::Result QFlickGestureRecognizer::recognize(QGesture *state, if (QWidget *w = qobject_cast<QWidget *>(as->target())) { scrollerRegion = QRect(w->mapToGlobal(QPoint(0, 0)), w->size()); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) } else if (QGraphicsObject *go = qobject_cast<QGraphicsObject *>(as->target())) { if (const auto *scene = go->scene()) { const auto goBoundingRectMappedToScene = go->mapToScene(go->boundingRect()); @@ -615,7 +617,7 @@ QGestureRecognizer::Result QFlickGestureRecognizer::recognize(QGesture *state, if (inputType) { if (QWidget *w = qobject_cast<QWidget *>(d->receiver)) point = w->mapFromGlobal(point.toPoint()); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) else if (QGraphicsObject *go = qobject_cast<QGraphicsObject *>(d->receiver)) point = go->mapFromScene(point); #endif @@ -632,7 +634,7 @@ QGestureRecognizer::Result QFlickGestureRecognizer::recognize(QGesture *state, // Consume all mouse events while dragging or scrolling to avoid nasty // side effects with Qt's standard widgets. if ((me -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) || gsme #endif ) && scrollerIsActive) @@ -644,7 +646,7 @@ QGestureRecognizer::Result QFlickGestureRecognizer::recognize(QGesture *state, // states of Qt's widgets (a QPushButton would stay in 'pressed' state // forever, if it doesn't receive a MouseRelease). if (me -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) || gsme #endif ) { @@ -659,7 +661,7 @@ QGestureRecognizer::Result QFlickGestureRecognizer::recognize(QGesture *state, } else { switch (event->type()) { case QEvent::MouseButtonPress: -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) case QEvent::GraphicsSceneMousePress: #endif if (scroller->state() == QScroller::Pressed) { @@ -678,7 +680,7 @@ QGestureRecognizer::Result QFlickGestureRecognizer::recognize(QGesture *state, break; case QEvent::MouseMove: -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) case QEvent::GraphicsSceneMouseMove: #endif if (PressDelayHandler::instance()->isDelaying()) @@ -688,7 +690,7 @@ QGestureRecognizer::Result QFlickGestureRecognizer::recognize(QGesture *state, result |= scrollerIsActive ? TriggerGesture : Ignore; break; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) case QEvent::GraphicsSceneMouseRelease: #endif case QEvent::MouseButtonRelease: diff --git a/src/widgets/util/qscroller.cpp b/src/widgets/util/qscroller.cpp index a348327c92..d8ac686fb9 100644 --- a/src/widgets/util/qscroller.cpp +++ b/src/widgets/util/qscroller.cpp @@ -52,9 +52,11 @@ #include <QMap> #include <QApplication> #include <QAbstractScrollArea> +#if QT_CONFIG(graphicsview) #include <QGraphicsObject> #include <QGraphicsScene> #include <QGraphicsView> +#endif #include <QDesktopWidget> #include <QVector2D> #include <QtCore/qmath.h> @@ -429,12 +431,12 @@ Qt::GestureType QScroller::grabGesture(QObject *target, ScrollerGestureType scro widget->grabGesture(sp->recognizerType); if (scrollGestureType == TouchGesture) widget->setAttribute(Qt::WA_AcceptTouchEvents); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) } else if (QGraphicsObject *go = qobject_cast<QGraphicsObject*>(target)) { if (scrollGestureType == TouchGesture) go->setAcceptTouchEvents(true); go->grabGesture(sp->recognizerType); -#endif // QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) } return sp->recognizerType; } @@ -473,7 +475,7 @@ void QScroller::ungrabGesture(QObject *target) if (target->isWidgetType()) { QWidget *widget = static_cast<QWidget *>(target); widget->ungrabGesture(sp->recognizerType); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) } else if (QGraphicsObject *go = qobject_cast<QGraphicsObject*>(target)) { go->ungrabGesture(sp->recognizerType); #endif @@ -571,7 +573,7 @@ QPointF QScroller::pixelPerMeter() const Q_D(const QScroller); QPointF ppm = d->pixelPerMeter; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (QGraphicsObject *go = qobject_cast<QGraphicsObject *>(d->target)) { QTransform viewtr; //TODO: the first view isn't really correct - maybe use an additional field in the prepare event? @@ -589,7 +591,7 @@ QPointF QScroller::pixelPerMeter() const ppm.ry() /= QLineF(p0, py).length(); } } -#endif // QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) return ppm; } @@ -1466,7 +1468,7 @@ bool QScrollerPrivate::prepareScrolling(const QPointF &position) if (QWidget *w = qobject_cast<QWidget *>(target)) setDpiFromWidget(w); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) if (QGraphicsObject *go = qobject_cast<QGraphicsObject *>(target)) { //TODO: the first view isn't really correct - maybe use an additional field in the prepare event? if (const auto *scene = go->scene()) { diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp index 14498c8b90..d9cbad4766 100644 --- a/src/widgets/widgets/qabstractscrollarea.cpp +++ b/src/widgets/widgets/qabstractscrollarea.cpp @@ -1475,7 +1475,7 @@ bool QAbstractScrollAreaPrivate::canStartScrollingAt( const QPoint &startPos ) { Q_Q(QAbstractScrollArea); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) // don't start scrolling when a drag mode has been set. // don't start scrolling on a movable item. if (QGraphicsView *view = qobject_cast<QGraphicsView *>(q)) { diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 58a1ff9e7f..4679ed95c5 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -487,7 +487,7 @@ QComboBoxPrivateContainer::QComboBoxPrivateContainer(QAbstractItemView *itemView void QComboBoxPrivateContainer::scrollItemView(int action) { -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) if (view->verticalScrollBar()) view->verticalScrollBar()->triggerAction(static_cast<QAbstractSlider::SliderAction>(action)); #endif @@ -506,7 +506,7 @@ void QComboBoxPrivateContainer::hideScrollers() */ void QComboBoxPrivateContainer::updateScrollers() { -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) if (!top || !bottom) return; @@ -533,7 +533,7 @@ void QComboBoxPrivateContainer::updateScrollers() top->hide(); bottom->hide(); } -#endif // QT_NO_SCROLLBAR +#endif // QT_CONFIG(scrollbar) } /* @@ -564,7 +564,7 @@ void QComboBoxPrivateContainer::setItemView(QAbstractItemView *itemView) if (view) { view->removeEventFilter(this); view->viewport()->removeEventFilter(this); -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) disconnect(view->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(updateScrollers())); disconnect(view->verticalScrollBar(), SIGNAL(rangeChanged(int,int)), @@ -589,7 +589,7 @@ void QComboBoxPrivateContainer::setItemView(QAbstractItemView *itemView) view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); QStyleOptionComboBox opt = comboStyleOption(); const bool usePopup = combo->style()->styleHint(QStyle::SH_ComboBox_Popup, &opt, combo); -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) if (usePopup) view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); #endif @@ -601,7 +601,7 @@ void QComboBoxPrivateContainer::setItemView(QAbstractItemView *itemView) view->setFrameStyle(QFrame::NoFrame); view->setLineWidth(0); view->setEditTriggers(QAbstractItemView::NoEditTriggers); -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) connect(view->verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(updateScrollers())); connect(view->verticalScrollBar(), SIGNAL(rangeChanged(int,int)), @@ -758,7 +758,7 @@ void QComboBoxPrivateContainer::hideEvent(QHideEvent *) { emit resetButton(); combo->update(); -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) // QGraphicsScenePrivate::removePopup closes the combo box popup, it hides it non-explicitly. // Hiding/showing the QComboBox after this will unexpectedly show the popup as well. // Re-hiding the popup container makes sure it is explicitly hidden. diff --git a/src/widgets/widgets/qdial.cpp b/src/widgets/widgets/qdial.cpp index a219e4ccb6..c08c820127 100644 --- a/src/widgets/widgets/qdial.cpp +++ b/src/widgets/widgets/qdial.cpp @@ -39,8 +39,6 @@ #include "qdial.h" -#ifndef QT_NO_DIAL - #include <qapplication.h> #include <qbitmap.h> #include <qcolor.h> @@ -480,5 +478,3 @@ bool QDial::event(QEvent *e) QT_END_NAMESPACE #include "moc_qdial.cpp" - -#endif // QT_NO_DIAL diff --git a/src/widgets/widgets/qdial.h b/src/widgets/widgets/qdial.h index 472b14fcdb..ed753d86b0 100644 --- a/src/widgets/widgets/qdial.h +++ b/src/widgets/widgets/qdial.h @@ -43,12 +43,11 @@ #include <QtWidgets/qtwidgetsglobal.h> -#if QT_CONFIG(dial) - #include <QtWidgets/qabstractslider.h> -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(dial); +QT_BEGIN_NAMESPACE class QDialPrivate; class QStyleOptionSlider; @@ -101,6 +100,4 @@ private: QT_END_NAMESPACE -#endif // QT_CONFIG(dial) - #endif // QDIAL_H diff --git a/src/widgets/widgets/qgroupbox.cpp b/src/widgets/widgets/qgroupbox.cpp index 9e323df9a6..611f3f88db 100644 --- a/src/widgets/widgets/qgroupbox.cpp +++ b/src/widgets/widgets/qgroupbox.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qgroupbox.h" -#ifndef QT_NO_GROUPBOX + #include "qapplication.h" #include "qbitmap.h" #include "qdrawutil.h" @@ -751,9 +751,6 @@ void QGroupBox::mouseReleaseEvent(QMouseEvent *event) update(style()->subControlRect(QStyle::CC_GroupBox, &box, QStyle::SC_GroupBoxCheckBox, this)); } - QT_END_NAMESPACE #include "moc_qgroupbox.cpp" - -#endif //QT_NO_GROUPBOX diff --git a/src/widgets/widgets/qgroupbox.h b/src/widgets/widgets/qgroupbox.h index a132d48e16..668dc03f3d 100644 --- a/src/widgets/widgets/qgroupbox.h +++ b/src/widgets/widgets/qgroupbox.h @@ -43,10 +43,9 @@ #include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qframe.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(groupbox); -#ifndef QT_NO_GROUPBOX +QT_BEGIN_NAMESPACE class QGroupBoxPrivate; class QStyleOptionGroupBox; @@ -104,8 +103,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_setChildrenEnabled(bool b)) }; -#endif // QT_NO_GROUPBOX - QT_END_NAMESPACE #endif // QGROUPBOX_H diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index f57fa4fd85..a4444a2b2c 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -1795,7 +1795,7 @@ QVariant QLineEdit::inputMethodQuery(Qt::InputMethodQuery property, QVariant arg return QVariant(d->xToPos(pt.x(), QTextLine::CursorBetweenCharacters)); return QVariant(d->control->cursor()); } case Qt::ImSurroundingText: - return QVariant(d->control->text()); + return QVariant(d->control->surroundingText()); case Qt::ImCurrentSelection: return QVariant(selectedText()); case Qt::ImMaximumTextLength: diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index 83dab9e110..79241ef720 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -56,6 +56,7 @@ #include "qinputmethod.h" #include "qlist.h" #endif +#include <qpainter.h> #include <qpropertyanimation.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h index 2d695f8411..92bdd4ad60 100644 --- a/src/widgets/widgets/qlineedit_p.h +++ b/src/widgets/widgets/qlineedit_p.h @@ -56,7 +56,9 @@ #ifndef QT_NO_LINEEDIT #include "private/qwidget_p.h" #include "QtWidgets/qlineedit.h" +#if QT_CONFIG(toolbutton) #include "QtWidgets/qtoolbutton.h" +#endif #include "QtGui/qtextlayout.h" #include "QtGui/qicon.h" #include "QtWidgets/qstyleoption.h" diff --git a/src/widgets/widgets/qmainwindow.cpp b/src/widgets/widgets/qmainwindow.cpp index 694a36ed5b..e1841bbc55 100644 --- a/src/widgets/widgets/qmainwindow.cpp +++ b/src/widgets/widgets/qmainwindow.cpp @@ -51,7 +51,9 @@ #include <qapplication.h> #include <qmenubar.h> +#if QT_CONFIG(statusbar) #include <qstatusbar.h> +#endif #include <qevent.h> #include <qstyle.h> #include <qdebug.h> @@ -578,7 +580,7 @@ void QMainWindow::setMenuWidget(QWidget *menuBar) } #endif // QT_NO_MENUBAR -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) /*! Returns the status bar for the main window. This function creates and returns an empty status bar if the status bar does not exist. @@ -615,7 +617,7 @@ void QMainWindow::setStatusBar(QStatusBar *statusbar) } d->layout->setStatusBar(statusbar); } -#endif // QT_NO_STATUSBAR +#endif // QT_CONFIG(statusbar) /*! Returns the central widget for the main window. This function @@ -1315,7 +1317,7 @@ bool QMainWindow::event(QEvent *event) #if QT_CONFIG(statustip) case QEvent::StatusTip: -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) if (QStatusBar *sb = d->layout->statusBar()) sb->showMessage(static_cast<QStatusTipEvent*>(event)->tip()); else diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h index aa26d4c23b..e0592d2c3f 100644 --- a/src/widgets/widgets/qmainwindow.h +++ b/src/widgets/widgets/qmainwindow.h @@ -131,7 +131,7 @@ public: void setMenuWidget(QWidget *menubar); #endif -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) QStatusBar *statusBar() const; void setStatusBar(QStatusBar *statusbar); #endif diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index 2c1c2ab75c..da5f00efe0 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -59,7 +59,9 @@ #endif #include <qapplication.h> +#if QT_CONFIG(statusbar) #include <qstatusbar.h> +#endif #include <qstring.h> #include <qstyle.h> #include <qstylepainter.h> @@ -2310,7 +2312,7 @@ void QMainWindowLayout::setDockOptions(QMainWindow::DockOptions opts) invalidate(); } -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) QStatusBar *QMainWindowLayout::statusBar() const { return statusbar ? qobject_cast<QStatusBar *>(statusbar->widget()) : 0; } @@ -2322,7 +2324,7 @@ void QMainWindowLayout::setStatusBar(QStatusBar *sb) statusbar = sb ? new QWidgetItemV2(sb) : 0; invalidate(); } -#endif // QT_NO_STATUSBAR +#endif // QT_CONFIG(statusbar) QWidget *QMainWindowLayout::centralWidget() const { diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index 948d6edeef..2ffc367da1 100644 --- a/src/widgets/widgets/qmainwindowlayout_p.h +++ b/src/widgets/widgets/qmainwindowlayout_p.h @@ -446,7 +446,7 @@ public: QLayoutItem *statusbar; -#ifndef QT_NO_STATUSBAR +#if QT_CONFIG(statusbar) QStatusBar *statusBar() const; void setStatusBar(QStatusBar *sb); #endif diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 58212a737a..4ee5b169e7 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -66,7 +66,9 @@ #include "qmenu_p.h" #include "qmenubar_p.h" #include "qwidgetaction.h" +#if QT_CONFIG(toolbutton) #include "qtoolbutton.h" +#endif #include "qpushbutton.h" #include "qtooltip.h" #include <private/qpushbutton_p.h> @@ -2324,7 +2326,7 @@ void QMenu::popup(const QPoint &p, QAction *atAction) const bool actionListChanged = d->itemsDirty; QRect screen; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) bool isEmbedded = !bypassGraphicsProxyWidget(this) && d->nearestGraphicsProxyWidget(this); if (isEmbedded) screen = d->popupGeometry(this); @@ -3593,7 +3595,7 @@ void QMenu::internalDelayedPopup() d->activeMenu->d_func()->causedPopup.action = d->currentAction; QRect screen; -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) bool isEmbedded = !bypassGraphicsProxyWidget(this) && d->nearestGraphicsProxyWidget(this); if (isEmbedded) screen = d->popupGeometry(this); diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index 552409a4ed..fd48058ec3 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -51,7 +51,9 @@ #include <qevent.h> #include <qmainwindow.h> #include <qtoolbar.h> +#if QT_CONFIG(toolbutton) #include <qtoolbutton.h> +#endif #if QT_CONFIG(whatsthis) #include <qwhatsthis.h> #endif diff --git a/src/widgets/widgets/qplaintextedit.cpp b/src/widgets/widgets/qplaintextedit.cpp index e19d4d4702..6d3f5649c2 100644 --- a/src/widgets/widgets/qplaintextedit.cpp +++ b/src/widgets/widgets/qplaintextedit.cpp @@ -947,7 +947,7 @@ void QPlainTextEditPrivate::pageUpDown(QTextCursor::MoveOperation op, QTextCurso } } -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) void QPlainTextEditPrivate::_q_adjustScrollbars() { diff --git a/src/widgets/widgets/qplaintextedit_p.h b/src/widgets/widgets/qplaintextedit_p.h index 803623c974..2484f9a33c 100644 --- a/src/widgets/widgets/qplaintextedit_p.h +++ b/src/widgets/widgets/qplaintextedit_p.h @@ -54,7 +54,9 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qabstractscrollarea_p.h" #include "QtGui/qtextdocumentfragment.h" +#if QT_CONFIG(scrollbar) #include "QtWidgets/qscrollbar.h" +#endif #include "QtGui/qtextcursor.h" #include "QtGui/qtextformat.h" #include "QtWidgets/qmenu.h" diff --git a/src/widgets/widgets/qprogressbar.cpp b/src/widgets/widgets/qprogressbar.cpp index e26673a010..91f7efa08c 100644 --- a/src/widgets/widgets/qprogressbar.cpp +++ b/src/widgets/widgets/qprogressbar.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qprogressbar.h" -#ifndef QT_NO_PROGRESSBAR + #include <qlocale.h> #include <qevent.h> #include <qpainter.h> @@ -623,5 +623,3 @@ QString QProgressBar::format() const QT_END_NAMESPACE #include "moc_qprogressbar.cpp" - -#endif // QT_NO_PROGRESSBAR diff --git a/src/widgets/widgets/qprogressbar.h b/src/widgets/widgets/qprogressbar.h index 2dbb7240c5..e0f5e9084b 100644 --- a/src/widgets/widgets/qprogressbar.h +++ b/src/widgets/widgets/qprogressbar.h @@ -43,10 +43,9 @@ #include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qframe.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(progressbar); -#ifndef QT_NO_PROGRESSBAR +QT_BEGIN_NAMESPACE class QProgressBarPrivate; class QStyleOptionProgressBar; @@ -119,8 +118,6 @@ private: Q_DISABLE_COPY(QProgressBar) }; -#endif // QT_NO_PROGRESSBAR - QT_END_NAMESPACE #endif // QPROGRESSBAR_H diff --git a/src/widgets/widgets/qscrollbar.cpp b/src/widgets/widgets/qscrollbar.cpp index a98f3fe085..e40c922e97 100644 --- a/src/widgets/widgets/qscrollbar.cpp +++ b/src/widgets/widgets/qscrollbar.cpp @@ -47,8 +47,6 @@ #include "qmenu.h" #include <QtCore/qelapsedtimer.h> -#ifndef QT_NO_SCROLLBAR - #ifndef QT_NO_ACCESSIBILITY #include "qaccessible.h" #endif @@ -728,5 +726,3 @@ Q_WIDGETS_EXPORT QStyleOptionSlider qt_qscrollbarStyleOption(QScrollBar *scrollb QT_END_NAMESPACE #include "moc_qscrollbar.cpp" - -#endif // QT_NO_SCROLLBAR diff --git a/src/widgets/widgets/qscrollbar.h b/src/widgets/widgets/qscrollbar.h index c180a62585..22b9bfcddb 100644 --- a/src/widgets/widgets/qscrollbar.h +++ b/src/widgets/widgets/qscrollbar.h @@ -43,10 +43,10 @@ #include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> -#if QT_CONFIG(scrollbar) - #include <QtWidgets/qabstractslider.h> +QT_REQUIRE_CONFIG(scrollbar); + QT_BEGIN_NAMESPACE class QScrollBarPrivate; @@ -96,6 +96,4 @@ private: QT_END_NAMESPACE -#endif // QT_CONFIG(scrollbar) - #endif // QSCROLLBAR_H diff --git a/src/widgets/widgets/qscrollbar_p.h b/src/widgets/widgets/qscrollbar_p.h index e748edf6a9..8693495c6f 100644 --- a/src/widgets/widgets/qscrollbar_p.h +++ b/src/widgets/widgets/qscrollbar_p.h @@ -55,6 +55,8 @@ #include "private/qabstractslider_p.h" #include "qstyle.h" +QT_REQUIRE_CONFIG(scrollbar); + QT_BEGIN_NAMESPACE class QScrollBarPrivate : public QAbstractSliderPrivate diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp index 7d507aa7f4..5f49623941 100644 --- a/src/widgets/widgets/qsplitter.cpp +++ b/src/widgets/widgets/qsplitter.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "qsplitter.h" -#ifndef QT_NO_SPLITTER #include "qapplication.h" #include "qcursor.h" @@ -1820,5 +1819,3 @@ QTextStream& operator>>(QTextStream& ts, QSplitter& splitter) QT_END_NAMESPACE #include "moc_qsplitter.cpp" - -#endif // QT_NO_SPLITTER diff --git a/src/widgets/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h index e9ef3c3f2d..bc4d7bca39 100644 --- a/src/widgets/widgets/qsplitter.h +++ b/src/widgets/widgets/qsplitter.h @@ -44,10 +44,9 @@ #include <QtWidgets/qframe.h> #include <QtWidgets/qsizepolicy.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(splitter); -#ifndef QT_NO_SPLITTER +QT_BEGIN_NAMESPACE class QSplitterPrivate; class QTextStream; @@ -164,8 +163,6 @@ private: Q_DECLARE_PRIVATE(QSplitterHandle) }; -#endif // QT_NO_SPLITTER - QT_END_NAMESPACE #endif // QSPLITTER_H diff --git a/src/widgets/widgets/qsplitter_p.h b/src/widgets/widgets/qsplitter_p.h index 34ae34121e..f0d621004f 100644 --- a/src/widgets/widgets/qsplitter_p.h +++ b/src/widgets/widgets/qsplitter_p.h @@ -54,6 +54,8 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qframe_p.h" +QT_REQUIRE_CONFIG(splitter); + QT_BEGIN_NAMESPACE static const uint Default = 2; diff --git a/src/widgets/widgets/qstatusbar.cpp b/src/widgets/widgets/qstatusbar.cpp index bdf728ead2..da7c86a2af 100644 --- a/src/widgets/widgets/qstatusbar.cpp +++ b/src/widgets/widgets/qstatusbar.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "qstatusbar.h" -#ifndef QT_NO_STATUSBAR #include "qlist.h" #include "qdebug.h" @@ -787,5 +786,3 @@ bool QStatusBar::event(QEvent *e) QT_END_NAMESPACE #include "moc_qstatusbar.cpp" - -#endif diff --git a/src/widgets/widgets/qstatusbar.h b/src/widgets/widgets/qstatusbar.h index aaabb99a27..9ac637931c 100644 --- a/src/widgets/widgets/qstatusbar.h +++ b/src/widgets/widgets/qstatusbar.h @@ -43,10 +43,9 @@ #include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qwidget.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(statusbar); -#ifndef QT_NO_STATUSBAR +QT_BEGIN_NAMESPACE class QStatusBarPrivate; @@ -94,8 +93,6 @@ private: Q_DECLARE_PRIVATE(QStatusBar) }; -#endif // QT_NO_STATUSBAR - QT_END_NAMESPACE #endif // QSTATUSBAR_H diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp index 902a6afb8a..0797120960 100644 --- a/src/widgets/widgets/qtextbrowser.cpp +++ b/src/widgets/widgets/qtextbrowser.cpp @@ -40,8 +40,6 @@ #include "qtextbrowser.h" #include "qtextedit_p.h" -#ifndef QT_NO_TEXTBROWSER - #include <qstack.h> #include <qapplication.h> #include <qevent.h> @@ -1270,5 +1268,3 @@ bool QTextBrowser::event(QEvent *e) QT_END_NAMESPACE #include "moc_qtextbrowser.cpp" - -#endif // QT_NO_TEXTBROWSER diff --git a/src/widgets/widgets/qtextbrowser.h b/src/widgets/widgets/qtextbrowser.h index 48b64d1216..f36c86bc86 100644 --- a/src/widgets/widgets/qtextbrowser.h +++ b/src/widgets/widgets/qtextbrowser.h @@ -44,10 +44,9 @@ #include <QtWidgets/qtextedit.h> #include <QtCore/qurl.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(textbrowser); -#ifndef QT_NO_TEXTBROWSER +QT_BEGIN_NAMESPACE class QTextBrowserPrivate; @@ -122,8 +121,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_highlightLink(const QString &)) }; -#endif // QT_NO_TEXTBROWSER - QT_END_NAMESPACE #endif // QTEXTBROWSER_H diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index 3eaf60116e..6ea67d385e 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -39,7 +39,9 @@ #include "qtextedit_p.h" #include "qlineedit.h" +#if QT_CONFIG(textbrowser) #include "qtextbrowser.h" +#endif #ifndef QT_NO_TEXTEDIT #include <qfont.h> @@ -243,7 +245,7 @@ void QTextEditPrivate::pageUpDown(QTextCursor::MoveOperation op, QTextCursor::Mo control->setTextCursor(cursor); } -#ifndef QT_NO_SCROLLBAR +#if QT_CONFIG(scrollbar) static QSize documentSize(QWidgetTextControl *control) { QTextDocument *doc = control->document(); @@ -2155,7 +2157,7 @@ void QTextEdit::setReadOnly(bool ro) Qt::TextInteractionFlags flags = Qt::NoTextInteraction; if (ro) { flags = Qt::TextSelectableByMouse; -#ifndef QT_NO_TEXTBROWSER +#if QT_CONFIG(textbrowser) if (qobject_cast<QTextBrowser *>(this)) flags |= Qt::TextBrowserInteraction; #endif diff --git a/src/widgets/widgets/qtextedit_p.h b/src/widgets/widgets/qtextedit_p.h index 13d0eb323a..28257fe29f 100644 --- a/src/widgets/widgets/qtextedit_p.h +++ b/src/widgets/widgets/qtextedit_p.h @@ -54,7 +54,9 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qabstractscrollarea_p.h" #include "QtGui/qtextdocumentfragment.h" +#if QT_CONFIG(scrollbar) #include "QtWidgets/qscrollbar.h" +#endif #include "QtGui/qtextcursor.h" #include "QtGui/qtextformat.h" #include "QtWidgets/qmenu.h" diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp index 476f9d4cfa..e162d46935 100644 --- a/src/widgets/widgets/qtoolbar.cpp +++ b/src/widgets/widgets/qtoolbar.cpp @@ -55,6 +55,7 @@ #endif #include <qsignalmapper.h> #include <qstylepainter.h> +#include <qstyleoption.h> #include <qtoolbutton.h> #include <qwidgetaction.h> #include <qtimer.h> diff --git a/src/widgets/widgets/qtoolbarextension.cpp b/src/widgets/widgets/qtoolbarextension.cpp index 267e220b8f..47cf16e0cc 100644 --- a/src/widgets/widgets/qtoolbarextension.cpp +++ b/src/widgets/widgets/qtoolbarextension.cpp @@ -43,8 +43,6 @@ #include <qstylepainter.h> #include <qstyleoption.h> -#ifndef QT_NO_TOOLBUTTON - QT_BEGIN_NAMESPACE QToolBarExtension::QToolBarExtension(QWidget *parent) @@ -88,5 +86,3 @@ QSize QToolBarExtension::sizeHint() const QT_END_NAMESPACE #include "moc_qtoolbarextension_p.cpp" - -#endif // QT_NO_TOOLBUTTON diff --git a/src/widgets/widgets/qtoolbarextension_p.h b/src/widgets/widgets/qtoolbarextension_p.h index c4d803165c..b6223107c4 100644 --- a/src/widgets/widgets/qtoolbarextension_p.h +++ b/src/widgets/widgets/qtoolbarextension_p.h @@ -54,9 +54,9 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtWidgets/qtoolbutton.h" -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(toolbutton); -#ifndef QT_NO_TOOLBUTTON +QT_BEGIN_NAMESPACE class Q_AUTOTEST_EXPORT QToolBarExtension : public QToolButton { @@ -71,8 +71,6 @@ public Q_SLOTS: void setOrientation(Qt::Orientation o); }; -#endif // QT_NO_TOOLBUTTON - QT_END_NAMESPACE #endif // QDYNAMICTOOLBAREXTENSION_P_H diff --git a/src/widgets/widgets/qtoolbarlayout.cpp b/src/widgets/widgets/qtoolbarlayout.cpp index 39e61a1951..118cb2ae61 100644 --- a/src/widgets/widgets/qtoolbarlayout.cpp +++ b/src/widgets/widgets/qtoolbarlayout.cpp @@ -42,7 +42,9 @@ #include <qwidgetaction.h> #include <qtoolbar.h> #include <qstyleoption.h> +#if QT_CONFIG(toolbutton) #include <qtoolbutton.h> +#endif #include <qmenu.h> #include <qdebug.h> #include <qmath.h> @@ -51,7 +53,9 @@ #endif #include "qmainwindowlayout_p.h" +#if QT_CONFIG(toolbutton) #include "qtoolbarextension_p.h" +#endif #include "qtoolbarlayout_p.h" #include "qtoolbarseparator_p.h" diff --git a/src/widgets/widgets/qtoolbox.cpp b/src/widgets/widgets/qtoolbox.cpp index 8413827e30..fdcd07eb06 100644 --- a/src/widgets/widgets/qtoolbox.cpp +++ b/src/widgets/widgets/qtoolbox.cpp @@ -39,8 +39,6 @@ #include "qtoolbox.h" -#ifndef QT_NO_TOOLBOX - #include <qapplication.h> #include <qeventloop.h> #include <qlayout.h> @@ -734,5 +732,3 @@ QT_END_NAMESPACE #include "moc_qtoolbox.cpp" #include "qtoolbox.moc" - -#endif //QT_NO_TOOLBOX diff --git a/src/widgets/widgets/qtoolbox.h b/src/widgets/widgets/qtoolbox.h index 6556d8a202..321507ba07 100644 --- a/src/widgets/widgets/qtoolbox.h +++ b/src/widgets/widgets/qtoolbox.h @@ -44,10 +44,9 @@ #include <QtWidgets/qframe.h> #include <QtGui/qicon.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(toolbox); -#ifndef QT_NO_TOOLBOX +QT_BEGIN_NAMESPACE class QToolBoxPrivate; @@ -119,8 +118,6 @@ inline int QToolBox::addItem(QWidget *item, const QIcon &iconSet, inline int QToolBox::insertItem(int index, QWidget *item, const QString &text) { return insertItem(index, item, QIcon(), text); } -#endif // QT_NO_TOOLBOX - QT_END_NAMESPACE #endif // QTOOLBOX_H diff --git a/src/widgets/widgets/qtoolbutton.cpp b/src/widgets/widgets/qtoolbutton.cpp index 13595575e6..f2c5814203 100644 --- a/src/widgets/widgets/qtoolbutton.cpp +++ b/src/widgets/widgets/qtoolbutton.cpp @@ -38,7 +38,6 @@ ****************************************************************************/ #include "qtoolbutton.h" -#ifndef QT_NO_TOOLBUTTON #include <qapplication.h> #include <qdesktopwidget.h> @@ -985,5 +984,3 @@ bool QToolButton::event(QEvent *event) QT_END_NAMESPACE #include "moc_qtoolbutton.cpp" - -#endif diff --git a/src/widgets/widgets/qtoolbutton.h b/src/widgets/widgets/qtoolbutton.h index e2470524da..7ba9a18fef 100644 --- a/src/widgets/widgets/qtoolbutton.h +++ b/src/widgets/widgets/qtoolbutton.h @@ -42,12 +42,11 @@ #include <QtWidgets/qtwidgetsglobal.h> -#if QT_CONFIG(toolbutton) - #include <QtWidgets/qabstractbutton.h> -QT_BEGIN_NAMESPACE +QT_REQUIRE_CONFIG(toolbutton); +QT_BEGIN_NAMESPACE class QToolButtonPrivate; class QMenu; @@ -137,6 +136,4 @@ private: QT_END_NAMESPACE -#endif // QT_CONFIG(toolbutton) - #endif // QTOOLBUTTON_H diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp index 9555ccc5b6..9281cc8ced 100644 --- a/src/widgets/widgets/qwidgetlinecontrol.cpp +++ b/src/widgets/widgets/qwidgetlinecontrol.cpp @@ -53,7 +53,7 @@ #endif #include "qapplication.h" -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) #include "qgraphicssceneevent.h" #endif diff --git a/src/widgets/widgets/qwidgetlinecontrol_p.h b/src/widgets/widgets/qwidgetlinecontrol_p.h index b9340c0aff..257402e9dc 100644 --- a/src/widgets/widgets/qwidgetlinecontrol_p.h +++ b/src/widgets/widgets/qwidgetlinecontrol_p.h @@ -250,6 +250,11 @@ public: QString displayText() const { return m_textLayout.text(); } + QString surroundingText() const + { + return m_text.isNull() ? QString::fromLatin1("") : m_text; + } + void backspace(); void del(); void deselect() { internalDeselect(); finishChange(); } diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp index 116855c8d3..706e63bbdc 100644 --- a/src/widgets/widgets/qwidgettextcontrol.cpp +++ b/src/widgets/widgets/qwidgettextcontrol.cpp @@ -58,7 +58,9 @@ #include "private/qtextdocument_p.h" #include "qtextlist.h" #include "private/qwidgettextcontrol_p.h" +#if QT_CONFIG(graphicsview) #include "qgraphicssceneevent.h" +#endif #include "qpagedpaintdevice.h" #include "private/qpagedpaintdevice_p.h" #include "qtextdocumentwriter.h" @@ -986,7 +988,7 @@ void QWidgetTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget if (!d->contextWidget) { switch (e->type()) { -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) case QEvent::GraphicsSceneMouseMove: case QEvent::GraphicsSceneMousePress: case QEvent::GraphicsSceneMouseRelease: @@ -1004,7 +1006,7 @@ void QWidgetTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget d->contextWidget = ev->widget(); break; } -#endif // QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) default: break; }; } @@ -1083,7 +1085,7 @@ void QWidgetTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget } #endif -#ifndef QT_NO_GRAPHICSVIEW +#if QT_CONFIG(graphicsview) case QEvent::GraphicsSceneMousePress: { QGraphicsSceneMouseEvent *ev = static_cast<QGraphicsSceneMouseEvent *>(e); d->mousePressEvent(ev, ev->button(), matrix.map(ev->pos()), ev->modifiers(), ev->buttons(), @@ -1133,7 +1135,7 @@ void QWidgetTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget if (d->dropEvent(ev->mimeData(), matrix.map(ev->pos()), ev->dropAction(), ev->source())) ev->accept(); break; } -#endif // QT_NO_GRAPHICSVIEW +#endif // QT_CONFIG(graphicsview) #ifdef QT_KEYPAD_NAVIGATION case QEvent::EnterEditFocus: case QEvent::LeaveEditFocus: diff --git a/src/widgets/widgets/qwidgettextcontrol_p_p.h b/src/widgets/widgets/qwidgettextcontrol_p_p.h index 357ffdc6bd..3917752d19 100644 --- a/src/widgets/widgets/qwidgettextcontrol_p_p.h +++ b/src/widgets/widgets/qwidgettextcontrol_p_p.h @@ -53,7 +53,6 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "QtGui/qtextdocumentfragment.h" -#include "QtWidgets/qscrollbar.h" #include "QtGui/qtextcursor.h" #include "QtGui/qtextformat.h" #include "QtWidgets/qmenu.h" diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri index aed3f53478..c204dad08d 100644 --- a/src/widgets/widgets/widgets.pri +++ b/src/widgets/widgets/widgets.pri @@ -5,10 +5,8 @@ HEADERS += \ widgets/qbuttongroup_p.h \ widgets/qabstractspinbox.h \ widgets/qabstractspinbox_p.h \ - widgets/qdial.h \ widgets/qframe.h \ widgets/qframe_p.h \ - widgets/qgroupbox.h \ widgets/qkeysequenceedit.h \ widgets/qkeysequenceedit_p.h \ widgets/qlineedit.h \ @@ -23,27 +21,17 @@ HEADERS += \ widgets/qmenu_p.h \ widgets/qmenubar.h \ widgets/qmenubar_p.h \ - widgets/qprogressbar.h \ - widgets/qscrollbar.h \ - widgets/qscrollbar_p.h \ widgets/qscrollarea_p.h \ widgets/qsizegrip.h \ widgets/qslider.h \ widgets/qspinbox.h \ - widgets/qsplitter.h \ - widgets/qsplitter_p.h \ widgets/qstackedwidget.h \ - widgets/qstatusbar.h \ widgets/qtextedit.h \ widgets/qtextedit_p.h \ - widgets/qtextbrowser.h \ widgets/qtoolbar.h \ widgets/qtoolbar_p.h \ widgets/qtoolbarlayout_p.h \ - widgets/qtoolbarextension_p.h \ widgets/qtoolbarseparator_p.h \ - widgets/qtoolbox.h \ - widgets/qtoolbutton.h \ widgets/qabstractscrollarea.h \ widgets/qabstractscrollarea_p.h \ widgets/qwidgetresizehandler_p.h \ @@ -58,10 +46,8 @@ HEADERS += \ SOURCES += \ widgets/qbuttongroup.cpp \ widgets/qabstractspinbox.cpp \ - widgets/qdial.cpp \ widgets/qeffects.cpp \ widgets/qframe.cpp \ - widgets/qgroupbox.cpp \ widgets/qkeysequenceedit.cpp \ widgets/qlineedit_p.cpp \ widgets/qlineedit.cpp \ @@ -71,22 +57,14 @@ SOURCES += \ widgets/qmdisubwindow.cpp \ widgets/qmenu.cpp \ widgets/qmenubar.cpp \ - widgets/qprogressbar.cpp \ - widgets/qscrollbar.cpp \ widgets/qsizegrip.cpp \ widgets/qslider.cpp \ widgets/qspinbox.cpp \ - widgets/qsplitter.cpp \ widgets/qstackedwidget.cpp \ - widgets/qstatusbar.cpp \ widgets/qtextedit.cpp \ - widgets/qtextbrowser.cpp \ widgets/qtoolbar.cpp \ widgets/qtoolbarlayout.cpp \ - widgets/qtoolbarextension.cpp \ widgets/qtoolbarseparator.cpp \ - widgets/qtoolbox.cpp \ - widgets/qtoolbutton.cpp \ widgets/qabstractscrollarea.cpp \ widgets/qwidgetresizehandler.cpp \ widgets/qfocusframe.cpp \ @@ -152,6 +130,11 @@ qtConfig(datetimeedit) { widgets/qdatetimeedit.cpp } +qtConfig(dial) { + HEADERS += widgets/qdial.h + SOURCES += widgets/qdial.cpp +} + qtConfig(dockwidget) { HEADERS += \ widgets/qdockwidget.h \ @@ -168,6 +151,11 @@ qtConfig(fontcombobox) { SOURCES += widgets/qfontcombobox.cpp } +qtConfig(groupbox) { + HEADERS += widgets/qgroupbox.h + SOURCES += widgets/qgroupbox.cpp +} + qtConfig(label) { HEADERS += \ widgets/qlabel.h \ @@ -185,6 +173,11 @@ qtConfig(lcdnumber) { widgets/qlcdnumber.cpp } +qtConfig(progressbar) { + HEADERS += widgets/qprogressbar.h + SOURCES += widgets/qprogressbar.cpp +} + qtConfig(pushbutton) { HEADERS += \ widgets/qpushbutton.h \ @@ -215,6 +208,14 @@ qtConfig(rubberband) { SOURCES += widgets/qrubberband.cpp } +qtConfig(scrollbar) { + HEADERS += \ + widgets/qscrollbar.h \ + widgets/qscrollbar_p.h + + SOURCES += widgets/qscrollbar.cpp +} + qtConfig(splashscreen) { HEADERS += \ widgets/qsplashscreen.h @@ -223,6 +224,19 @@ qtConfig(splashscreen) { widgets/qsplashscreen.cpp } +qtConfig(splitter) { + HEADERS += \ + widgets/qsplitter.h \ + widgets/qsplitter_p.h + + SOURCES += widgets/qsplitter.cpp +} + +qtConfig(statusbar) { + HEADERS += widgets/qstatusbar.h + SOURCES += widgets/qstatusbar.cpp +} + qtConfig(tabbar) { HEADERS += \ widgets/qtabbar.h \ @@ -231,11 +245,31 @@ qtConfig(tabbar) { SOURCES += widgets/qtabbar.cpp } +qtConfig(textbrowser) { + HEADERS += widgets/qtextbrowser.h + SOURCES += widgets/qtextbrowser.cpp +} + qtConfig(tabwidget) { HEADERS += widgets/qtabwidget.h SOURCES += widgets/qtabwidget.cpp } +qtConfig(toolbox) { + HEADERS += widgets/qtoolbox.h + SOURCES += widgets/qtoolbox.cpp +} + +qtConfig(toolbutton) { + HEADERS += \ + widgets/qtoolbutton.h \ + widgets/qtoolbarextension_p.h + + SOURCES += \ + widgets/qtoolbutton.cpp \ + widgets/qtoolbarextension.cpp +} + qtConfig(widgettextcontrol) { HEADERS += \ widgets/qwidgettextcontrol_p.h \ |