Merge branch 'KDE/4.8'
Conflicts: plasma/declarativeimports/plasmacomponents/qmenu.cpp
This commit is contained in:
commit
764253359e
@ -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()) {
|
||||
|
@ -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();
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user