fixed 'volume of undefined' warning
commitfd04f35d9361d6d5d457a8bedd1e7360eacbcd40
authorNick Dedekind <nick.dedekind@canonical.com>
dateWed 1 Jul 2015, 12:24 (11 years ago)
parent6ce3e9c
tests/mocks/QMenuModel/QDBusActionGroup.qml+2−2
@@ -41,8 +41,8 @@ QtObject {
4141 signal activated
4242
4343 property string actionName: \"" + actionName + "\"
44− property bool valid: ActionData.data[actionName] != undefined ? ActionData.data[actionName].valid : false
45− property var state: ActionData.data[actionName] != undefined ? ActionData.data[actionName].state : undefined
44+ property bool valid: ActionData.data.hasOwnProperty(actionName) ? ActionData.data[actionName].valid : false
45+ property var state: ActionData.data.hasOwnProperty(actionName) ? ActionData.data[actionName].state : undefined
4646
4747 function activate() {
4848 activated();
tests/mocks/QMenuModel/actiondata.h+3−1
@@ -31,7 +31,9 @@ class Q_DECL_EXPORT ActionData : public QObject
3131public:
3232 ActionData(QObject* parent = 0)
3333 : QObject(parent)
34− {}
34+ , m_data(QVariantMap())
35+ {
36+ }
3537
3638 QVariant data() const { return m_data; }
3739 void setData(const QVariant& data)