Merge lp:~zsombi/ubuntu-ui-toolkit/labelThemingFix into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Label makes sure the color alteration is known by the theming.

PIMPL added. Font and color properties overloaded.

Performance: no performance change
==================================
Before MR:
tst_performance: PASS : tst_Performance::benchmark_GridOfComponents(grid with Label 1.3)
tst_performance: RESULT : tst_Performance::benchmark_GridOfComponents():"grid with Label 1.3":
tst_performance: 3.1 msecs per iteration (total: 51, iterations: 16)

After MR:
tst_performance: PASS : tst_Performance::benchmark_GridOfComponents(grid with Label 1.3)
tst_Performance::benchmark_GridOfComponents():"grid with Label 1.3":
tst_performance: 3.1 msecs per iteration (total: 51, iterations: 16)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1892
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/475/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1624/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/475/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1892
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/242/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1625/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/242/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1892
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/465/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1626/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/465/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1892
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/219/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1627/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/219/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1892
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/137/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/465/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/475/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/242/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/219/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1628/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1626
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1624
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1625
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1627

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/137/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/labelThemingFix]

1893. By Zsombor Egri on 2016-03-14

fix tests, remove unrelated test

1894. By Zsombor Egri on 2016-03-14

merge staging

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1894
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/481/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1702/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/481/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1894
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/493/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1705/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/493/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1894
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/258/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1708/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/258/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1894
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/235/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1709/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/235/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1894
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/150/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/481
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/493
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/493/artifact/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/258
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/235
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1710/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1702
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1705
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1708
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1709

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/150/rebuild

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

I took a moment to sort out whether the PIMPL by itself is essential to the fix - and I confirmed this in IRC - it's fair to say it doesn't magically help, but it does make things a whole lot cleaner. The real fix is in the property overrides in setFont2 and setColor2 and being able to set with and without flipping the flag. And that makes sense.
The test also looks sensible.

review: Approve

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1894
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/260/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1713/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/260/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1894
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/483/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1714/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/483/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1894
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/237/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1715/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/237/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1894
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/495/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/1716/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/495/rebuild

review: Approve (continuous-integration)

=== added file 'src/Ubuntu/Components/plugin/label_p.h'
--- src/Ubuntu/Components/plugin/label_p.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/label_p.h	2016-03-14 18:57:32 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LABEL_P
+#define LABEL_P
+
+#include "uclabel.h"
+
+class UCLabelPrivate
+{
+    Q_DECLARE_PUBLIC(UCLabel)
+public:
+    explicit UCLabelPrivate(UCLabel *qq);
+    UCLabelPrivate(UCLabel *qq, UCLabel::ColorProviderFunc func);
+
+    static UCLabelPrivate *get(UCLabel *q)
+    {
+        return q->d_func();
+    }
+
+    void init();
+
+    // slots
+    void updateRenderType();
+
+    // methods
+    void updatePixelSize();
+
+    // members
+    enum {
+        TextSizeSet = 1,
+        PixelSizeSet = 2,
+        ColorSet = 4
+    };
+
+    UCLabel *q_ptr;
+    QFont defaultFont;
+    UCLabel::ColorProviderFunc defaultColor;
+    UCLabel::TextSize textSize;
+    quint8 flags;
+
+protected:
+    static QColor getDefaultColor(QQuickItem *item, UCTheme *theme);
+};
+
+#endif // LABEL_P
+

=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
--- src/Ubuntu/Components/plugin/plugin.pri	2016-02-25 18:22:54 +0000
+++ src/Ubuntu/Components/plugin/plugin.pri	2016-03-14 18:57:32 +0000
@@ -115,7 +115,8 @@
     $$PWD/privates/ucpagewrapper.h \
     $$PWD/privates/ucpagewrapper_p.h \
     $$PWD/privates/ucpagewrapperincubator_p.h \
-    $$PWD/privates/appheaderbase.h
+    $$PWD/privates/appheaderbase.h \
+    $$PWD/label_p.h
 
 SOURCES += $$PWD/plugin.cpp \
     $$PWD/uctheme.cpp \

=== modified file 'src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp'
--- src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp	2016-01-30 10:51:22 +0000
+++ src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp	2016-03-14 18:57:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2015-2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,7 +15,7 @@
  */
 
 #include "threelabelsslot_p.h"
-#include "uclabel.h"
+#include "label_p.h"
 #include "ucunits.h"
 #include "ucfontutils.h"
 #include "uctheme.h"
@@ -148,7 +148,7 @@
     if (d->m_title == Q_NULLPTR) {
         d->m_title = new UCLabel(this);
         QQmlEngine::setContextForObject(d->m_title, qmlContext(this));
-        d->m_title->init();
+        UCLabelPrivate::get(d->m_title)->init();
 
         QQuickAnchors *titleAnchors = QQuickItemPrivate::get(d->m_title)->anchors();
         titleAnchors->setLeft(d->left());
@@ -193,7 +193,7 @@
     if (d->m_subtitle == Q_NULLPTR) {
         d->m_subtitle = new UCLabel(getSubtitleColor, this);
         QQmlEngine::setContextForObject(d->m_subtitle, qmlContext(this));
-        d->m_subtitle->init();
+        UCLabelPrivate::get(d->m_subtitle)->init();
 
         QQuickAnchors *subtitleAnchors = QQuickItemPrivate::get(d->m_subtitle)->anchors();
         subtitleAnchors->setLeft(d->left());
@@ -223,7 +223,7 @@
     if (d->m_summary == Q_NULLPTR) {
         d->m_summary = new UCLabel(getSummaryColor, this);
         QQmlEngine::setContextForObject(d->m_summary, qmlContext(this));
-        d->m_summary->init();
+        UCLabelPrivate::get(d->m_summary)->init();
 
         QQuickAnchors *summaryAnchors = QQuickItemPrivate::get(d->m_summary)->anchors();
         summaryAnchors->setLeft(d->left());

=== modified file 'src/Ubuntu/Components/plugin/uclabel.cpp'
--- src/Ubuntu/Components/plugin/uclabel.cpp	2016-01-30 10:51:22 +0000
+++ src/Ubuntu/Components/plugin/uclabel.cpp	2016-03-14 18:57:32 +0000
@@ -14,49 +14,54 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "uclabel.h"
+#include "label_p.h"
 #include "ucfontutils.h"
 #include "ucnamespace.h"
 #include "ucunits.h"
 #include "uctheme.h"
 
-void UCLabel::updatePixelSize()
-{
-    if (m_flags & PixelSizeSet) {
+UCLabelPrivate::UCLabelPrivate(UCLabel *qq)
+    : q_ptr(qq)
+    , defaultColor(getDefaultColor)
+    , textSize(UCLabel::Medium)
+    , flags(0)
+{
+}
+
+UCLabelPrivate::UCLabelPrivate(UCLabel *qq, UCLabel::ColorProviderFunc func)
+    : q_ptr(qq)
+    , defaultColor(func)
+    , textSize(UCLabel::Medium)
+    , flags(0)
+{
+}
+
+void UCLabelPrivate::updatePixelSize()
+{
+    if (flags & PixelSizeSet) {
         return;
     }
+
+    Q_Q(UCLabel);
     const float sizes[] = {
         UCFontUtils::xxSmallScale, UCFontUtils::xSmallScale, UCFontUtils::smallScale,
         UCFontUtils::mediumScale, UCFontUtils::largeScale, UCFontUtils::xLargeScale
     };
-    QFont textFont = font();
+    QFont textFont = q->font();
     textFont.setPixelSize(
-        qRound(sizes[m_textSize] * UCUnits::instance()->dp(UCFontUtils::fontUnits)));
-    setFont(textFont);
-    // remove PixelSizeSet flag
-    m_flags &= ~PixelSizeSet;
+        qRound(sizes[textSize] * UCUnits::instance()->dp(UCFontUtils::fontUnits)));
+    q->setFont(textFont);
 }
 
-void UCLabel::updateRenderType()
+void UCLabelPrivate::updateRenderType()
 {
+    Q_Q(UCLabel);
+    QQuickText *qtext = static_cast<QQuickText*>(q);
     if (UCUnits::instance()->gridUnit() <= 10) {
-        QQuickText::setRenderType(QQuickText::NativeRendering);
+        qtext->setRenderType(QQuickText::NativeRendering);
     } else {
-        QQuickText::setRenderType(QQuickText::QtRendering);
-    }
-}
-
-void UCLabel::_q_updateFontFlag(const QFont &font)
-{
-    Q_UNUSED(font);
-    if (m_defaultFont.pixelSize() != font.pixelSize()) {
-        m_flags |= PixelSizeSet;
-    }
-}
-
-void UCLabel::_q_customColor()
-{
-    m_flags |= ColorSet;
+        qtext->setRenderType(QQuickText::QtRendering);
+    }
 }
 
 /*!
@@ -88,60 +93,64 @@
 UCLabel::UCLabel(QQuickItem* parent)
     : QQuickText(parent)
     , UCThemingExtension(this)
-    , m_defaultColor(getDefaultColor)
-    , m_textSize(Medium)
-    , m_flags(0)
+    , d_ptr(new UCLabelPrivate(this))
 {
 }
 
-UCLabel::UCLabel(std::function<QColor (QQuickItem*, UCTheme*)> defaultColor, QQuickItem *parent)
+UCLabel::UCLabel(ColorProviderFunc defaultColor, QQuickItem *parent)
     : QQuickText(parent)
     , UCThemingExtension(this)
-    , m_defaultColor(defaultColor)
-    , m_textSize(Medium)
-    , m_flags(0)
-{
+    , d_ptr(new UCLabelPrivate(this, defaultColor))
+{
+}
+UCLabel::~UCLabel()
+{
+    delete d_ptr;
 }
 
-QColor UCLabel::getDefaultColor(QQuickItem *item, UCTheme *theme)
+QColor UCLabelPrivate::getDefaultColor(QQuickItem *item, UCTheme *theme)
 {
     // FIXME: replace the code below with automatic color
-    // change detection based on teh item's state
+    // change detection based on the item's state
     const char *valueSet = item->isEnabled() ? "normal" : "disabled";
     return theme ? theme->getPaletteColor(valueSet, "backgroundText") : QColor();
 }
 
 void UCLabel::classBegin()
 {
+    Q_D(UCLabel);
     QQuickText::classBegin();
-    init();
+    d->init();
 }
 
-void UCLabel::init()
+void UCLabelPrivate::init()
 {
-    postThemeChanged();
+    Q_Q(UCLabel);
+    q->postThemeChanged();
+
     updatePixelSize();
-    m_defaultFont = font();
-    m_defaultFont.setFamily("Ubuntu");
-    m_defaultFont.setWeight(QFont::Light);
-    setFont(m_defaultFont);
+    defaultFont = q->font();
+    defaultFont.setFamily("Ubuntu");
+    defaultFont.setWeight(QFont::Light);
+    q->setFont(defaultFont);
     updateRenderType();
 
-    connect(UCUnits::instance(), &UCUnits::gridUnitChanged, this, &UCLabel::updateRenderType);
-    connect(this, &UCLabel::fontChanged, this, &UCLabel::_q_updateFontFlag, Qt::DirectConnection);
-    connect(this, &UCLabel::colorChanged, this, &UCLabel::_q_customColor, Qt::DirectConnection);
-    connect(this, &UCLabel::enabledChanged, this, &UCLabel::postThemeChanged, Qt::DirectConnection);
+    QObject::connect(UCUnits::instance(), SIGNAL(gridUnitChanged()), q, SLOT(updateRenderType()));
+    QObject::connect(q, &UCLabel::enabledChanged, q, &UCLabel::postThemeChanged, Qt::DirectConnection);
+
+    QObject::connect(q, &UCLabel::fontChanged, q, &UCLabel::fontChanged2, Qt::DirectConnection);
+    QObject::connect(q, &UCLabel::colorChanged, q, &UCLabel::colorChanged2, Qt::DirectConnection);
 }
 
 void UCLabel::postThemeChanged()
 {
-    if (m_flags & ColorSet) {
+    Q_D(UCLabel);
+    if (d->flags & UCLabelPrivate::ColorSet) {
         return;
     }
     UCTheme *theme = getTheme();
     if (theme) {
-        setColor(m_defaultColor(this, theme));
-        m_flags &= ~ColorSet;
+        setColor(d->defaultColor(this, theme));
     }
 }
 
@@ -163,24 +172,48 @@
  *  \li \b Label.XLarge - very large font size
  *  \endlist
  */
+UCLabel::TextSize UCLabel::textSize() const
+{
+    Q_D(const UCLabel);
+    return d->textSize;
+}
 void UCLabel::setTextSize(TextSize size)
 {
-    if (!(m_flags & TextSizeSet)) {
+    Q_D(UCLabel);
+    if (!(d->flags & UCLabelPrivate::TextSizeSet)) {
         Q_EMIT fontSizeChanged();
-        m_flags |= TextSizeSet;
+        d->flags |= UCLabelPrivate::TextSizeSet;
     }
 
-    if (m_textSize != size) {
-        m_textSize = size;
-        updatePixelSize();
+    if (d->textSize != size) {
+        d->textSize = size;
+        d->updatePixelSize();
         Q_EMIT textSizeChanged();
     }
 }
 
+void UCLabel::setFont2(const QFont &font)
+{
+    Q_D(UCLabel);
+    // we must restrict ourself to the pixelSize change as any font property change will
+    // lead to the setter call.
+    if (d->defaultFont.pixelSize() != font.pixelSize()) {
+        d->flags |= UCLabelPrivate::PixelSizeSet;
+    }
+    QQuickText::setFont(font);
+}
+
+void UCLabel::setColor2(const QColor &color)
+{
+    Q_D(UCLabel);
+    d->flags |= UCLabelPrivate::ColorSet;
+    QQuickText::setColor(color);
+}
+
 void UCLabel::setRenderType(RenderType renderType)
 {
-    disconnect(UCUnits::instance(), &UCUnits::gridUnitChanged,
-               this, &UCLabel::updateRenderType);
+    disconnect(UCUnits::instance(), SIGNAL(gridUnitChanged()),
+               this, SLOT(updateRenderType()));
     QQuickText::setRenderType(renderType);
 }
 
@@ -203,9 +236,20 @@
  *  \li \b "x-large" - very large font size
  *  \endlist
  */
+QString UCLabel::fontSize() const
+{
+    Q_D(const UCLabel);
+    if (d->flags & UCLabelPrivate::TextSizeSet) {
+        return "";
+    }
+    const char* const sizes[] =
+        { "xx-small", "x-small", "small", "medium", "large", "x-large" };
+    return QString(sizes[d->textSize]);
+}
 void UCLabel::setFontSize(const QString& fontSize)
 {
-    if (m_flags & TextSizeSet) {
+    Q_D(UCLabel);
+    if (d->flags & UCLabelPrivate::TextSizeSet) {
         return;
     }
     if (fontSize.size() < 4) {
@@ -225,9 +269,12 @@
         default: { return; }
     }
 
-    if (m_textSize != textSize) {
-        m_textSize = textSize;
-        updatePixelSize();
+    if (d->textSize != textSize) {
+        d->textSize = textSize;
+        d->updatePixelSize();
         Q_EMIT fontSizeChanged();
     }
 }
+
+
+#include "moc_uclabel.cpp"

=== modified file 'src/Ubuntu/Components/plugin/uclabel.h'
--- src/Ubuntu/Components/plugin/uclabel.h	2016-01-28 11:26:21 +0000
+++ src/Ubuntu/Components/plugin/uclabel.h	2016-03-14 18:57:32 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -22,25 +22,30 @@
 // C++ std lib for std::function declaration
 #include <functional>
 
+class UCLabelPrivate;
 class UCLabel : public QQuickText, public UCThemingExtension
 {
     Q_OBJECT
     Q_INTERFACES(UCThemingExtension)
     Q_ENUMS(TextSize)
-    Q_PROPERTY(TextSize textSize MEMBER m_textSize WRITE setTextSize NOTIFY textSizeChanged FINAL)
+    Q_PROPERTY(TextSize textSize READ textSize WRITE setTextSize NOTIFY textSizeChanged FINAL)
 
     // Overriden from QQuickText
     Q_PROPERTY(RenderType renderType READ renderType WRITE setRenderType)
+    Q_PROPERTY(QFont font READ font WRITE setFont2 NOTIFY fontChanged2)
+    Q_PROPERTY(QColor color READ color WRITE setColor2 NOTIFY colorChanged2)
 
     // Deprecated.
     Q_PROPERTY(QString fontSize READ fontSize WRITE setFontSize NOTIFY fontSizeChanged)
 
 public:
+
+    typedef std::function<QColor (QQuickItem*, UCTheme*)> ColorProviderFunc;
+
     UCLabel(QQuickItem* parent=0);
     // custom constructor to create the label with a different default color provider
-    UCLabel(std::function<QColor (QQuickItem*, UCTheme*)> defaultColor, QQuickItem *parent = 0);
-    //QQuickTextPrivate is not exported as of 5.4.1 so we need the init here
-    void init();
+    UCLabel(ColorProviderFunc defaultColor, QQuickItem *parent = 0);
+    ~UCLabel();
 
     enum TextSize {
         XxSmall = 0,
@@ -51,19 +56,16 @@
         XLarge = 5
     };
 
+    TextSize textSize() const;
     void setTextSize(TextSize size);
+
+    // overriden from QQuickText
+    void setFont2(const QFont &font);
+    void setColor2(const QColor &color);
     void setRenderType(RenderType renderType);
 
     // Deprecated.
-    QString fontSize() const
-    {
-        if (m_flags & TextSizeSet) {
-            return "";
-        }
-        const char* const sizes[] =
-            { "xx-small", "x-small", "small", "medium", "large", "x-large" };
-        return QString(sizes[m_textSize]);
-    }
+    QString fontSize() const;
     void setFontSize(const QString& fontSize);
 
 protected:
@@ -77,26 +79,18 @@
 Q_SIGNALS:
     void textSizeChanged();
 
+    // overrides
+    void fontChanged2();
+    void colorChanged2();
+
     // Deprecated.
     void fontSizeChanged();
 
 private:
-    void updatePixelSize();
-    static QColor getDefaultColor(QQuickItem *item, UCTheme *theme);
-    Q_SLOT void updateRenderType();
-    Q_SLOT void _q_updateFontFlag(const QFont &font);
-    Q_SLOT void _q_customColor();
-
-    enum {
-        TextSizeSet = 1,
-        PixelSizeSet = 2,
-        ColorSet = 4
-    };
-
-    QFont m_defaultFont;
-    std::function<QColor (QQuickItem *, UCTheme*)> m_defaultColor;
-    TextSize m_textSize;
-    quint8 m_flags;
+    Q_PRIVATE_SLOT(d_func(), void updateRenderType())
+
+    UCLabelPrivate *d_ptr;
+    Q_DECLARE_PRIVATE(UCLabel)
 
     Q_DISABLE_COPY(UCLabel)
 };

=== modified file 'tests/unit/tst_components/tst_label13.qml'
--- tests/unit/tst_components/tst_label13.qml	2016-01-26 14:46:00 +0000
+++ tests/unit/tst_components/tst_label13.qml	2016-03-14 18:57:32 +0000
@@ -81,8 +81,8 @@
         ];
     }
     function test_fontSize_equals_textSize(data) {
-        textCustom.textSize = data.size;
-        fuzzyCompare(textCustom.font.pixelSize, FontUtils.sizeToPixels(data.tag), 0.999, "pixelSize differs for " + data.tag);
+        textFontSize.textSize = data.size;
+        fuzzyCompare(textFontSize.font.pixelSize, FontUtils.sizeToPixels(data.tag), 0.999, "pixelSize differs for " + data.tag);
     }
 
     function test_fontWeight_data() {
@@ -161,6 +161,9 @@
     Label {
         id: textCustom
     }
+    Label {
+        id: textFontSize
+    }
 
     Label {
         id: lightLabel

=== modified file 'tests/unit_x11/tst_components/tst_label_extras.qml'
--- tests/unit_x11/tst_components/tst_label_extras.qml	2015-10-08 10:48:10 +0000
+++ tests/unit_x11/tst_components/tst_label_extras.qml	2016-03-14 18:57:32 +0000
@@ -36,14 +36,46 @@
         }
     }
 
+    Component {
+        id: testLabel
+        Label {
+            text: "Hello Dolly!"
+        }
+    }
+
+    Loader {
+        id: testLoader
+    }
+
     UbuntuTestCase {
         name: "Label13Extras"
         when: windowShown
 
+        function loadTest(component) {
+            testLoader.sourceComponent = component;
+            tryCompare(testLoader, "status", Loader.Ready, 1000);
+            verify(testLoader.item);
+            return testLoader.item;
+        }
+
+        function cleanup() {
+            testLoader.sourceComponent = null;
+            waitForRendering(main, 400);
+        }
+
         function test_label_with_button_bug1503901() {
             // this should SEGFAULT on error!
-            var test = labelWithButton.createObject(main);
-            test.destroy();
+            loadTest(labelWithButton);
+        }
+
+        function test_label_color_changes_even_with_same_value_as_default_bug1555784() {
+            var test = loadTest(testLabel);
+
+            // override the text color with the same as the default
+            test.color = theme.palette.normal.backgroundText;
+            // change the color of the palette
+            theme.palette.normal.backgroundText = UbuntuColors.blue;
+            verify(test.color != theme.palette.normal.backgroundText);
         }
     }
 }