diff options
author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-11-28 20:07:56 -0300 |
---|---|---|
committer | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-11-28 20:07:56 -0300 |
commit | 98ed17ed5c2ebab3a396906d4219af2e99988370 (patch) | |
tree | 526d7f52989723d623e426862393890c60b6cece /libqmenumodel/src/qdbusactiongroup.cpp | |
parent | 53dfc2a919fd03f5570cb106d71d3989a3f528d9 (diff) | |
parent | da5a0437d57df35409fedb568b7ebf4e3d6af0da (diff) | |
download | qmenumodel-98ed17ed5c2ebab3a396906d4219af2e99988370.tar.gz qmenumodel-98ed17ed5c2ebab3a396906d4219af2e99988370.tar.bz2 qmenumodel-98ed17ed5c2ebab3a396906d4219af2e99988370.zip |
Merged mainline.
Diffstat (limited to 'libqmenumodel/src/qdbusactiongroup.cpp')
-rw-r--r-- | libqmenumodel/src/qdbusactiongroup.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libqmenumodel/src/qdbusactiongroup.cpp b/libqmenumodel/src/qdbusactiongroup.cpp index 756bb76..824b5f0 100644 --- a/libqmenumodel/src/qdbusactiongroup.cpp +++ b/libqmenumodel/src/qdbusactiongroup.cpp @@ -104,7 +104,7 @@ bool QDBusActionGroup::hasAction(const QString &name) QStateAction *QDBusActionGroup::actionImpl(const QString &name) { Q_FOREACH(QStateAction *act, this->findChildren<QStateAction*>()) { - if (act->text() == name) { + if (act->name() == name) { return act; } } @@ -194,7 +194,7 @@ void QDBusActionGroup::setActionGroup(GDBusActionGroup *ag) void QDBusActionGroup::clear() { Q_FOREACH(QStateAction *act, this->findChildren<QStateAction*>()) { - Q_EMIT actionVanish(act->text()); + Q_EMIT actionVanish(act->name()); } if (m_actionGroup != NULL) { |