diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-24 00:37:09 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-24 21:37:56 +0000 |
| commit | 3a2a765b657a40810439e858a03577b1f7320cc7 (patch) | |
| tree | 60f33233dc1584a5de7d771a849a3754343835e3 /src | |
| parent | c547fc4f2ccdcb631846032b9948aaa8cb6444df (diff) | |
QQuickTextFieldPrivate: inherit QQuickTextInputPrivate
Change-Id: Id98d16065a21e5328ff88bc7a2aff8a1324d2fd8
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/controls/qquicktextfield.cpp | 8 | ||||
| -rw-r--r-- | src/controls/qquicktextfield_p.h | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/controls/qquicktextfield.cpp b/src/controls/qquicktextfield.cpp index ba79fbed..5a8ddc9c 100644 --- a/src/controls/qquicktextfield.cpp +++ b/src/controls/qquicktextfield.cpp @@ -39,6 +39,7 @@ #include <QtQuick/private/qquickitem_p.h> #include <QtQuick/private/qquicktext_p.h> #include <QtQuick/private/qquickclipnode_p.h> +#include <QtQuick/private/qquicktextinput_p_p.h> QT_BEGIN_NAMESPACE @@ -71,7 +72,7 @@ QT_BEGIN_NAMESPACE \sa TextArea, {Customizing TextField} */ -class QQuickTextFieldPrivate +class QQuickTextFieldPrivate : public QQuickTextInputPrivate { Q_DECLARE_PUBLIC(QQuickTextField) @@ -82,7 +83,6 @@ public: QQuickItem *background; QQuickText *placeholder; - QQuickTextField *q_ptr; }; void QQuickTextFieldPrivate::resizeBackground() @@ -102,10 +102,8 @@ void QQuickTextFieldPrivate::resizeBackground() } QQuickTextField::QQuickTextField(QQuickItem *parent) : - QQuickTextInput(parent), d_ptr(new QQuickTextFieldPrivate) + QQuickTextInput(*(new QQuickTextFieldPrivate), parent) { - Q_D(QQuickTextField); - d->q_ptr = this; } QQuickTextField::~QQuickTextField() diff --git a/src/controls/qquicktextfield_p.h b/src/controls/qquicktextfield_p.h index 899e9054..41d39316 100644 --- a/src/controls/qquicktextfield_p.h +++ b/src/controls/qquicktextfield_p.h @@ -83,7 +83,6 @@ protected: private: Q_DISABLE_COPY(QQuickTextField) Q_DECLARE_PRIVATE(QQuickTextField) - QScopedPointer<QQuickTextFieldPrivate> d_ptr; }; QT_END_NAMESPACE |