Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/cutDownDepWarn into lp:ubuntu-ui-toolkit/staging

[Cris Dywan]

Only print unique deprecation notes

[Zsombor Egri (zsombi)]

Perhaps we should move this showDeprecationNote to ucnamespace and use it widely for all deprecation notes. Then we can turn them on/off everywhere. Perhaps a separate MR to do that.

[Zsombor Egri (zsombi)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/935/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/242
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/242/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/242

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1505
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1772/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2857
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/500
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/502
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/502/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/499
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2447
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2855
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2855/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20555

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1772/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/938/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/246
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/245
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/245/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/245

review: Needs Fixing (continuous-integration)

=== modified file 'modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp'
--- modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp	2015-05-04 11:20:26 +0000
+++ modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp	2015-05-18 05:50:31 +0000
@@ -65,6 +65,7 @@
 UCDeprecatedTheme::UCDeprecatedTheme(QObject *parent)
     : QObject(parent)
 {
+    m_notes = QHash<QString, bool>();
     connect(&UCTheme::defaultTheme(), &UCTheme::nameChanged,
             this, &UCDeprecatedTheme::nameChanged);
     connect(&UCTheme::defaultTheme(), &UCTheme::paletteChanged,
@@ -73,9 +74,13 @@
 
 void UCDeprecatedTheme::showDeprecatedNote(QObject *onItem, const char *note)
 {
+    QString noteId(QString("%1.%2").arg(note).arg(onItem->metaObject()->className()));
+    if (m_notes.contains(noteId))
+        return;
     QByteArray suppressNote = qgetenv("SUPPRESS_DEPRECATED_NOTE");
     if (suppressNote.isEmpty() || suppressNote != "yes") {
         qmlInfo(onItem) << note;
+        m_notes.insert(noteId, true);
     }
 }
 

=== modified file 'modules/Ubuntu/Components/plugin/ucdeprecatedtheme.h'
--- modules/Ubuntu/Components/plugin/ucdeprecatedtheme.h	2015-04-24 14:07:02 +0000
+++ modules/Ubuntu/Components/plugin/ucdeprecatedtheme.h	2015-05-18 05:50:31 +0000
@@ -20,6 +20,7 @@
 #define UCDEPRECATEDTHEME_H
 
 #include <QtCore/QObject>
+#include <QtCore/QHash>
 
 class QQmlComponent;
 class QQmlContext;
@@ -51,6 +52,7 @@
 
 private:
     void showDeprecatedNote(QObject *onItem, const char *note);
+    QHash<QString, bool> m_notes;
 };
 
 #endif // UCDEPRECATEDTHEME_H