Ubuntu UI Toolkit

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

  1. noDepNoteForComponents
  2. Merge into staging
Proposed by Christian Dywan on 2015-05-27
Status: Merged
Approved by: Zsombor Egri on 2015-05-29
Approved revision: 1521
Merged at revision: 1522
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/noDepNoteForComponents
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 26 lines (+9/-0)
1 file modified
modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp (+9/-0)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/noDepNoteForComponents
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-05-29
Zsombor Egri (community) 2015-05-27 Approve on 2015-05-27
Review via email: mp+260302@code.launchpad.net

Commit Message

No deprecation notes for our own components

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1520
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1794/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2963/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/522
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/524
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/524/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/521
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2532/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2961
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2961/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20766

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

review: Needs Fixing (continuous-integration)
Zsombor Egri (zsombi) wrote :

Small request, and good to go.

review: Needs Fixing
Zsombor Egri (zsombi) wrote :

Much better :) Thanks!

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1521
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1811/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2996
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/539
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/541
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/541/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/538
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2554
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2994
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2994/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20808

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

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp'
2--- modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp 2015-05-18 05:42:05 +0000
3+++ modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp 2015-05-27 18:03:19 +0000
4@@ -23,6 +23,7 @@
5 #include <QtQml/QQmlComponent>
6 #include <QtQml/QQmlContext>
7 #include <QtQml/QQmlInfo>
8+#include <QtQml/QQmlEngine>
9
10 /*!
11 \qmltype Theme
12@@ -74,6 +75,14 @@
13
14 void UCDeprecatedTheme::showDeprecatedNote(QObject *onItem, const char *note)
15 {
16+ QQmlContext ctx(QQmlEngine::contextForObject(onItem));
17+ // No warnings due to deprecated code used in the components themselves
18+ if (ctx.baseUrl().toString().contains("/Ubuntu/Components/"))
19+ return;
20+ // Warnings without a filename are not helpful
21+ if (ctx.baseUrl().isEmpty())
22+ return;
23+
24 QString noteId(QString("%1.%2").arg(note).arg(onItem->metaObject()->className()));
25 if (m_notes.contains(noteId))
26 return;

Subscribers

People subscribed via source and target branches