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/qquicktextfield_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/qquicktextfield_p_p.h')
| -rw-r--r-- | src/quicktemplates2/qquicktextfield_p_p.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/quicktemplates2/qquicktextfield_p_p.h b/src/quicktemplates2/qquicktextfield_p_p.h index 97cbe910..e8dc625b 100644 --- a/src/quicktemplates2/qquicktextfield_p_p.h +++ b/src/quicktemplates2/qquicktextfield_p_p.h @@ -53,7 +53,7 @@ #include <QtQuickTemplates2/private/qquicktextfield_p.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include <QtGui/qaccessible.h> #endif @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE class QQuickAccessibleAttached; class QQuickTextFieldPrivate : public QQuickTextInputPrivate -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) , public QAccessible::ActivationObserver #endif { @@ -79,7 +79,9 @@ public: void resolveFont(); void inheritFont(const QFont &f); +#if QT_CONFIG(quicktemplates2_hover) void updateHoverEnabled(bool h, bool e); +#endif qreal getImplicitWidth() const override; qreal getImplicitHeight() const override; @@ -90,25 +92,21 @@ public: void readOnlyChanged(bool isReadOnly); void echoModeChanged(QQuickTextField::EchoMode echoMode); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) void accessibilityActiveChanged(bool active) override; QAccessible::Role accessibleRole() const override; #endif - void deleteDelegate(QObject *object); - +#if QT_CONFIG(quicktemplates2_hover) bool hovered; bool explicitHoverEnabled; +#endif QFont font; QQuickItem *background; QString placeholder; Qt::FocusReason focusReason; QQuickPressHandler pressHandler; QQuickAccessibleAttached *accessibleAttached; - // 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; }; QT_END_NAMESPACE |