diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-01 09:56:19 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-03-01 10:05:21 +0100 |
| commit | 91d1fc42d37501555fea3674b93f5fd81401b518 (patch) | |
| tree | 5c9150606db89a00989d7a3450c287efbeb1b7cd /src/quicktemplates2/qquickcontrol_p_p.h | |
| parent | 8b5490c3acb2731cc5bf7b968128138d96259939 (diff) | |
| parent | a19ab6806043591abf94868de6962a3747284da7 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Ia4c692552e6573b33b2e0f6b43b2a482a78ad970
Diffstat (limited to 'src/quicktemplates2/qquickcontrol_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickcontrol_p_p.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h index 5ee9d9b9..113110de 100644 --- a/src/quicktemplates2/qquickcontrol_p_p.h +++ b/src/quicktemplates2/qquickcontrol_p_p.h @@ -54,7 +54,7 @@ #include <QtQml/private/qlazilyallocated_p.h> #include <qpa/qplatformtheme.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include <QtGui/qaccessible.h> #endif @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE class QQuickAccessibleAttached; class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickControlPrivate : public QQuickItemPrivate -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) , public QAccessible::ActivationObserver #endif { @@ -90,7 +90,7 @@ public: virtual QQuickItem *getContentItem(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) void accessibilityActiveChanged(bool active) override; QAccessible::Role accessibleRole() const override; #endif @@ -111,19 +111,17 @@ public: static void updateLocaleRecur(QQuickItem *item, const QLocale &l); static QLocale calcLocale(const QQuickItem *item); +#if QT_CONFIG(quicktemplates2_hover) void updateHoverEnabled(bool enabled, bool xplicit); static void updateHoverEnabledRecur(QQuickItem *item, bool enabled); static bool calcHoverEnabled(const QQuickItem *item); +#endif - void deleteDelegate(QObject *object); + static void destroyDelegate(QObject *object, QObject *parent); struct ExtraData { ExtraData(); QFont font; - // This list contains the default delegates which were - // replaced with custom ones via declarative assignments - // before Component.completed() was emitted. See QTBUG-50992. - QVector<QObject*> pendingDeletions; }; QLazilyAllocated<ExtraData> extra; @@ -133,9 +131,11 @@ public: bool hasRightPadding; bool hasBottomPadding; bool hasLocale; - bool hovered; bool wheelEnabled; +#if QT_CONFIG(quicktemplates2_hover) + bool hovered; bool explicitHoverEnabled; +#endif qreal padding; qreal topPadding; qreal leftPadding; |