From: Kevin Krammer <kevin.krammer@kdab.com>
Date: Wed, 17 Oct 2012 16:04:25 +0000 (+0200)
Subject: Allow non-action QObjects as children of QMenu
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=49432165d6a2be132233e549e278abc414924718;p=web%2Fkonrad%2FDeclarativeWidgets.git

Allow non-action QObjects as children of QMenu

E.g. for attaching anything non-visual like a timer
---

diff --git a/declarativeobjects.cpp b/declarativeobjects.cpp
index 28f390a..c2462d3 100644
--- a/declarativeobjects.cpp
+++ b/declarativeobjects.cpp
@@ -236,14 +236,12 @@ DeclarativeMenu::DeclarativeMenu(QObject *parent) : DeclarativeWidgetProxy<QMenu
 void DeclarativeMenu::addQObject(QObject *object, AbstractDeclarativeObject *declarativeObject)
 {
   QAction *action = qobject_cast<QAction*>(object);
-  if (!action) {
-    qmlInfo(declarativeObject) << "The QMenu can only contain QMenu or QAction";
-    return;
+  if (action) {
+      m_proxiedObject->addAction(action);
+      m_children.append(declarativeObject);
+  } else {
+      DeclarativeWidgetProxy<QMenu>::addQObject(object, declarativeObject);
   }
-
-  m_proxiedObject->addAction(action);
-
-  m_children.append(declarativeObject);
 }
 
 void DeclarativeMenu::addWidget(QWidget *widget, AbstractDeclarativeObject *declarativeObject)