~ubuntu-branches/ubuntu/wily/ubuntu-system-settings/wily-proposed

« back to all changes in this revision

Viewing changes to tests/test-plugin.cpp

  • Committer: Package Import Robot
  • Author(s): CI Train Bot, Ken VanDine, Robert Ancell, Sebastien Bacher, jonas-drange
  • Date: 2015-08-27 07:47:59 UTC
  • mfrom: (1.4.23)
  • Revision ID: package-import@ubuntu.com-20150827074759-l3cwh1fyhlre91zy
Tags: 0.3+15.10.20150827-0ubuntu1
[ Ken VanDine ]
* Don't show the phone number in the about page, that is now provided
  by address-book-app (LP: #1364452)

[ Robert Ancell ]
* Use new QML package names for qml-module-qt-labs-folderlistmodel,
  qml-module-qtsysteminfo.

[ Sebastien Bacher ]
* [security-privacy] rename the "Lock phone" item to "Locking and
  unlocking" and do not include the screen delay as a value, it
  misleads users to think that the section is only about that where it
  also includes security options (LP: #1361127)
* [security-privacy] use the correct access to location string (LP:
  #1388184)

[ jonas-drange ]
* Use wait_select_single instead of select_single to make the test
  less flaky
* [plugin] add has-dynamic-name to allow for dynamic renaming of a
  plugin. (LP: #1475629)

Show diffs side-by-side

added added

removed removed

Lines of Context:
38
38
                                          QObject *parent = 0);
39
39
    virtual QQmlComponent *pageComponent(QQmlEngine *engine,
40
40
                                         QObject *parent = 0);
 
41
    QString name() const;
41
42
private:
42
43
    QQmlComponent *m_pageComponent;
43
44
};
46
47
    ItemBase(staticData, parent),
47
48
    m_pageComponent(0)
48
49
{
49
 
    QStringList keywords;
50
 
    keywords << "one" << "two" << "three";
51
 
    setKeywords(keywords);
 
50
    QString name = staticData["name"].toString();
 
51
    if (name == "Wireless") {
 
52
        QStringList keywords;
 
53
        keywords << "one" << "two" << "three";
 
54
        setKeywords(keywords);
 
55
    } else if (name == "Brightness") {
 
56
        setName("Brightness & Display");
 
57
    }
52
58
}
53
59
 
54
60
TestItem::~TestItem()