From 12f1725fc8af9bd833232d37d2a69c25eda7a311 Mon Sep 17 00:00:00 2001
From: Script Kiddy <scripty@kde.org>
Date: Wed, 21 Dec 2011 09:55:19 +0100
Subject: [PATCH 1/3] SVN_SILENT made messages (.desktop file)

---
 .../data/plasma-scriptengine-applet-declarative.desktop          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scriptengines/javascript/data/plasma-scriptengine-applet-declarative.desktop b/scriptengines/javascript/data/plasma-scriptengine-applet-declarative.desktop
index c2da1173d..8c529b22f 100644
--- a/scriptengines/javascript/data/plasma-scriptengine-applet-declarative.desktop
+++ b/scriptengines/javascript/data/plasma-scriptengine-applet-declarative.desktop
@@ -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

From d4b7cccfc7b0cd1323a3eb723f73a2db025bca70 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Wed, 21 Dec 2011 12:09:17 +0100
Subject: [PATCH 2/3] revert api addition on 4.9

this was supposed to be only for master/4.9
---
 declarativeimports/plasmacomponents/qmenu.cpp | 13 -------------
 declarativeimports/plasmacomponents/qmenu.h   |  2 --
 2 files changed, 15 deletions(-)

diff --git a/declarativeimports/plasmacomponents/qmenu.cpp b/declarativeimports/plasmacomponents/qmenu.cpp
index b513c4f8e..db613ee7b 100644
--- a/declarativeimports/plasmacomponents/qmenu.cpp
+++ b/declarativeimports/plasmacomponents/qmenu.cpp
@@ -73,19 +73,6 @@ void QMenuProxy::setVisualParent(QDeclarativeItem *parent)
     emit visualParentChanged();
 }
 
-void QMenuProxy::clearMenuItems()
-{
-    qDeleteAll(m_items);
-    m_items.clear();
-}
-
-void QMenuProxy::addMenuItem(const QString &text)
-{
-    QMenuItem *item = new QMenuItem(this);
-    item->setText(text);
-    m_items << item;
-}
-
 void QMenuProxy::showMenu(int x, int y)
 {
     m_menu->clear();
diff --git a/declarativeimports/plasmacomponents/qmenu.h b/declarativeimports/plasmacomponents/qmenu.h
index 5332a35ef..0f503efaf 100644
--- a/declarativeimports/plasmacomponents/qmenu.h
+++ b/declarativeimports/plasmacomponents/qmenu.h
@@ -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();

From 4e8d9963abace7695413f46a4480e2ef82cec090 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Tue, 27 Dec 2011 18:26:05 +0100
Subject: [PATCH 3/3] BUGFIX: assign visualparent if it's set

not the other way around
---
 declarativeimports/plasmacomponents/qmenu.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/declarativeimports/plasmacomponents/qmenu.cpp b/declarativeimports/plasmacomponents/qmenu.cpp
index db613ee7b..b4e690d0e 100644
--- a/declarativeimports/plasmacomponents/qmenu.cpp
+++ b/declarativeimports/plasmacomponents/qmenu.cpp
@@ -97,9 +97,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()) {