alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'KDE/4.8'

Browse Source 
Conflicts:
	plasma/declarativeimports/plasmacomponents/qmenu.cpp
This commit is contained in:
Marco Martin 2011-12-27 18:29:12 +01:00
commit 764253359e
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
declarativeimports/plasmacomponents/qmenu.cpp
View File

@ -124,9 +124,9 @@ void QMenuProxy::open()
QGraphicsObject *parentItem;
if (m_visualParent) {
parentItem = qobject_cast<QGraphicsObject *>(parent());
} else {
parentItem = m_visualParent.data();
} else {
parentItem = qobject_cast<QGraphicsObject *>(parent());
}
if (!parentItem || !parentItem->scene()) {

2
declarativeimports/plasmacomponents/qmenu.h
View File

@ -52,8 +52,6 @@ public:
void showMenu(int x, int y);
Q_INVOKABLE void open();
Q_INVOKABLE void close();
Q_INVOKABLE void clearMenuItems();
Q_INVOKABLE void addMenuItem(const QString &text);
Q_SIGNALS:
void statusChanged();

1
scriptengines/javascript/data/plasma-scriptengine-applet-declarative.desktop
View File

@ -30,6 +30,7 @@ Name[nb]=Deklarativt skjermelement
Name[nds]=Stüerelement för Verkloren
Name[nl]=Widget voor declaratie
Name[nn]=Deklarativt skjermelement
Name[pa]=ਡਿਕਲਰੇਟਿਵ ਵਿਦਜੈੱਟ
Name[pl]=Deklaratywny element interfejsu
Name[pt]=Item declarativo
Name[pt_BR]=Widget declarativo