diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-06-29 10:53:01 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-06-29 13:22:48 +0000 |
| commit | a07606a56b1bc8d277ef5cfc394178b660a0c30c (patch) | |
| tree | d0c567613ec0149f09ef77662144b2e72b2472fb /src/imports | |
| parent | f379e58bf51f1b32782a54f455401b86c83c3ee4 (diff) | |
Add hover support to TextArea & TextField
Task-number: QTBUG-50003
Change-Id: Ie101ba8840fba2a7503da8de77d9cf2a3c91d562
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/controls/TextArea.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/TextField.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/material/TextArea.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/material/TextField.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/qtquickcontrols2plugin.cpp | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/TextArea.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/universal/TextField.qml | 2 | ||||
| -rw-r--r-- | src/imports/templates/qtquicktemplates2plugin.cpp | 2 |
8 files changed, 10 insertions, 6 deletions
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index f1ec6dfa..8fe34661 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Templates 2.0 as T +import QtQuick.Templates 2.1 as T T.TextArea { id: control diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index 2234646f..5fdb6fc9 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Templates 2.0 as T +import QtQuick.Templates 2.1 as T T.TextField { id: control diff --git a/src/imports/controls/material/TextArea.qml b/src/imports/controls/material/TextArea.qml index b37e2311..45cb478e 100644 --- a/src/imports/controls/material/TextArea.qml +++ b/src/imports/controls/material/TextArea.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Templates 2.0 as T +import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.0 T.TextArea { diff --git a/src/imports/controls/material/TextField.qml b/src/imports/controls/material/TextField.qml index 9c576ca6..13397326 100644 --- a/src/imports/controls/material/TextField.qml +++ b/src/imports/controls/material/TextField.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Templates 2.0 as T +import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.0 T.TextField { diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 416e57ef..cd7272ec 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -145,6 +145,8 @@ void QtQuickControls2Plugin::registerTypes(const char *uri) qmlRegisterType(selector.select(QStringLiteral("SpinBox.qml")), uri, 2, 1, "SpinBox"); qmlRegisterType(selector.select(QStringLiteral("StackView.qml")), uri, 2, 1, "StackView"); qmlRegisterType(selector.select(QStringLiteral("SwipeView.qml")), uri, 2, 1, "SwipeView"); + qmlRegisterType(selector.select(QStringLiteral("TextArea.qml")), uri, 2, 1, "TextArea"); + qmlRegisterType(selector.select(QStringLiteral("TextField.qml")), uri, 2, 1, "TextField"); qmlRegisterType(selector.select(QStringLiteral("Tumbler.qml")), uri, 2, 1, "Tumbler"); } diff --git a/src/imports/controls/universal/TextArea.qml b/src/imports/controls/universal/TextArea.qml index 5ca490e7..9acda0db 100644 --- a/src/imports/controls/universal/TextArea.qml +++ b/src/imports/controls/universal/TextArea.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Templates 2.0 as T +import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.0 T.TextArea { diff --git a/src/imports/controls/universal/TextField.qml b/src/imports/controls/universal/TextField.qml index 13587b5a..64efc77e 100644 --- a/src/imports/controls/universal/TextField.qml +++ b/src/imports/controls/universal/TextField.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Templates 2.0 as T +import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.0 T.TextField { diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index 1903d52c..300cc2fa 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -183,6 +183,8 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) qmlRegisterType<QQuickSpinBox, 1>(uri, 2, 1, "SpinBox"); qmlRegisterType<QQuickStackView, 1>(uri, 2, 1, "StackView"); qmlRegisterType<QQuickSwipeView, 1>(uri, 2, 1, "SwipeView"); + qmlRegisterType<QQuickTextArea, 1>(uri, 2, 1, "TextArea"); + qmlRegisterType<QQuickTextField, 1>(uri, 2, 1, "TextField"); qmlRegisterType<QQuickTumbler, 1>(uri, 2, 1, "Tumbler"); } |