← Back to branch summary

~bpierre/ubuntu-ui-toolkit/newbutton

« back to all changes in this revision

Viewing changes to src/Ubuntu/Components/plugin/uclabel.cpp

  • Committer: Pierre Bertet
  • Date: 2016-03-31 08:57:11 UTC
  • mfrom: (1851.1.64 staging)
  • Revision ID: pierre.bertet@canonical.com-20160331085711-i9tl9com945clp67
[sync] merge staging

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Ubuntu/Components/plugin/uclabel.cpp
105
105
}
106
106
UCLabel::~UCLabel()
107
107
{
108
 
    delete d_ptr;
 
108
    // disconnect functor, so QQuickItem's enabledChanged won't call into the invalid functor
 
109
    disconnect(this, &UCLabel::enabledChanged, this, &UCLabel::postThemeChanged);
109
110
}
110
111
 
111
112
QColor UCLabelPrivate::getDefaultColor(QQuickItem *item, UCTheme *theme)