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
23
#include <QtQml/QQmlComponent>
23
#include <QtQml/QQmlComponent>
6
24
#include <QtQml/QQmlContext>
24
#include <QtQml/QQmlContext>
7
25
#include <QtQml/QQmlInfo>
25
#include <QtQml/QQmlInfo>
8
26
#include <QtQml/QQmlEngine>
9
26
27
10
27
/*!
28
/*!
11
28
    \qmltype Theme
29
    \qmltype Theme
12
@@ -74,6 +75,14 @@
13
74
75
14
75
void UCDeprecatedTheme::showDeprecatedNote(QObject *onItem, const char *note)
76
void UCDeprecatedTheme::showDeprecatedNote(QObject *onItem, const char *note)
15
76
{
77
{
16
78
    QQmlContext ctx(QQmlEngine::contextForObject(onItem));
17
79
    // No warnings due to deprecated code used in the components themselves
18
80
    if (ctx.baseUrl().toString().contains("/Ubuntu/Components/"))
19
81
        return;
20
82
    // Warnings without a filename are not helpful
21
83
    if (ctx.baseUrl().isEmpty())
22
84
        return;
23
85
24
77
    QString noteId(QString("%1.%2").arg(note).arg(onItem->metaObject()->className()));
86
    QString noteId(QString("%1.%2").arg(note).arg(onItem->metaObject()->className()));
25
78
    if (m_notes.contains(noteId))
87
    if (m_notes.contains(noteId))
26
79
        return;
88
        return;
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-05-29
Zsombor Egri		2015-05-27	Approve on 2015-05-27
Review via email: mp+260302@code.launchpad.net