diff options
Diffstat (limited to 'src/widgets/kernel/qwidget.h')
| -rw-r--r-- | src/widgets/kernel/qwidget.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index 06ac265ede..e5e83a43f2 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -8,7 +8,9 @@ #include <QtGui/qwindowdefs.h> #include <QtCore/qobject.h> #include <QtCore/qmargins.h> +#if QT_CONFIG(action) #include <QtGui/qaction.h> +#endif #include <QtGui/qpaintdevice.h> #include <QtGui/qpalette.h> #include <QtGui/qfont.h> @@ -175,6 +177,7 @@ class Q_WIDGETS_EXPORT QWidget : public QObject, public QPaintDevice Q_PROPERTY(QString windowFilePath READ windowFilePath WRITE setWindowFilePath) Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints) +#if QT_CONFIG(action) #if 0 // ### TODO: make this work (requires SFINAE-friendly connect()) template <typename...Args> @@ -197,6 +200,8 @@ class Q_WIDGETS_EXPORT QWidget : public QObject, public QPaintDevice std::negation<std::is_convertible<Args, QString>>... >>; #endif +#endif // QT_CONFIG(action) + public: enum RenderFlag { DrawWindowBackground = 0x1, @@ -427,6 +432,7 @@ public: void setFocusPolicy(Qt::FocusPolicy policy); bool hasFocus() const; static void setTabOrder(QWidget *, QWidget *); + static void setTabOrder(std::initializer_list<QWidget *> widgets); void setFocusProxy(QWidget *); QWidget *focusProxy() const; Qt::ContextMenuPolicy contextMenuPolicy() const; @@ -763,9 +769,6 @@ private: #endif // QT_NO_GESTURES friend class QWidgetEffectSourcePrivate; -#ifdef Q_OS_MAC - friend bool qt_mac_is_metal(const QWidget *w); -#endif friend Q_WIDGETS_EXPORT QWidgetData *qt_qwidget_data(QWidget *widget); friend Q_WIDGETS_EXPORT QWidgetPrivate *qt_widget_private(QWidget *widget); @@ -911,7 +914,6 @@ inline bool QWidget::testAttribute(Qt::WidgetAttribute attribute) const return testAttribute_helper(attribute); } - #define QWIDGETSIZE_MAX ((1<<24)-1) #ifndef QT_NO_DEBUG_STREAM |