From e7d14e132f882ff68c8dc33596f71ae929f47466 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@theqtcompany.com>
Date: Fri, 6 Mar 2015 08:40:01 +0100
Subject: QQuickAbstractLabel: inherit QQuickText

Change-Id: I98679c8f3dffde96531c41c8219b60050d1e33dd
Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
---
 src/imports/controls/Label.qml                  | 6 +++---
 src/imports/controls/qtquickcontrols2plugin.cpp | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/imports/controls')

diff --git a/src/imports/controls/Label.qml b/src/imports/controls/Label.qml
index f258791d..2cd3e5fa 100644
--- a/src/imports/controls/Label.qml
+++ b/src/imports/controls/Label.qml
@@ -37,11 +37,11 @@
 import QtQuick 2.6
 import QtQuick.Controls 2.0
 
-Text {
+AbstractLabel {
     id: control
 
-    // TODO: color: style.textColor
-
     Accessible.name: text
     Accessible.role: Accessible.StaticText
+
+    color: Style.textColor
 }
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index 7fbdfc8e..22622c9f 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtquickcontrols2plugin.cpp
@@ -43,6 +43,7 @@
 #include <QtQuickControls/private/qquickabstractcheckbox_p.h>
 #include <QtQuickControls/private/qquickabstractframe_p.h>
 #include <QtQuickControls/private/qquickabstractgroupbox_p.h>
+#include <QtQuickControls/private/qquickabstractlabel_p.h>
 #include <QtQuickControls/private/qquickabstractpageindicator_p.h>
 #include <QtQuickControls/private/qquickabstractprogressbar_p.h>
 #include <QtQuickControls/private/qquickabstractradiobutton_p.h>
@@ -88,6 +89,7 @@ void QtQuickControls2Plugin::registerTypes(const char *uri)
     qmlRegisterType<QQuickAbstractCheckBox>(uri, 2, 0, "AbstractCheckBox");
     qmlRegisterType<QQuickAbstractFrame>(uri, 2, 0, "AbstractFrame");
     qmlRegisterType<QQuickAbstractGroupBox>(uri, 2, 0, "AbstractGroupBox");
+    qmlRegisterType<QQuickAbstractLabel>(uri, 2, 0, "AbstractLabel");
     qmlRegisterType<QQuickAbstractPageIndicator>(uri, 2, 0, "AbstractPageIndicator");
     qmlRegisterType<QQuickAbstractProgressBar>(uri, 2, 0, "AbstractProgressBar");
     qmlRegisterType<QQuickAbstractRadioButton>(uri, 2, 0, "AbstractRadioButton");
@@ -113,6 +115,7 @@ void QtQuickControls2Plugin::registerTypes(const char *uri)
     qmlRegisterType<QQuickControl>(uri, 2, 0, "Control");
     qmlRegisterType<QQuickExclusiveGroup>(uri, 2, 0, "ExclusiveGroup");
 
+    qmlRegisterRevision<QQuickText, 6>(uri, 2, 0);
     qmlRegisterRevision<QQuickTextInput, 6>(uri, 2, 0);
     qmlRegisterRevision<QQuickTextEdit, 6>(uri, 2, 0);
 }
-- 
cgit v1.2.3