From: Tobias Koenig <tobias.koenig@kdab.com>
Date: Sun, 28 Oct 2012 08:15:59 +0000 (+0100)
Subject: Add support for ToolButton
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=5aa035ec8425e056385180df5f568f5808d88c5e;p=web%2Fkonrad%2FDeclarativeWidgets.git

Add support for ToolButton
---

diff --git a/declarativeobjects.cpp b/declarativeobjects.cpp
index fb36a9a..5d8f10c 100644
--- a/declarativeobjects.cpp
+++ b/declarativeobjects.cpp
@@ -1409,6 +1409,14 @@ void DeclarativeToolBar::addAction(QAction *action, AbstractDeclarativeObject *d
 
 CUSTOM_METAOBJECT(DeclarativeToolBar, QToolBar)
 
+// DeclarativeToolButton
+DeclarativeToolButton::DeclarativeToolButton(QObject *parent) : DeclarativeWidgetProxy<QToolButton>(parent)
+{
+  connectAllSignals(m_proxiedObject, this);
+}
+
+CUSTOM_METAOBJECT(DeclarativeToolButton, QToolButton)
+
 // DeclarativeWebView
 DeclarativeWebView::DeclarativeWebView(QObject *parent) : DeclarativeWidgetProxy<QWebView>(parent)
 {
diff --git a/declarativeobjects_p.h b/declarativeobjects_p.h
index b79e93e..39a76f7 100644
--- a/declarativeobjects_p.h
+++ b/declarativeobjects_p.h
@@ -29,6 +29,7 @@
 #include <QtGui/QTabWidget>
 #include <QtGui/QTextBrowser>
 #include <QtGui/QToolBar>
+#include <QtGui/QToolButton>
 #include <QtGui/QVBoxLayout>
 #include <QtWebKit/QWebView>
 #include <QtDeclarative/QDeclarativeListProperty>
@@ -835,6 +836,14 @@ class DeclarativeToolBar : public DeclarativeWidgetProxy<QToolBar>
     virtual void addAction(QAction *action, AbstractDeclarativeObject *declarativeObject);
 };
 
+class DeclarativeToolButton : public DeclarativeWidgetProxy<QToolButton>
+{
+  DECLARATIVE_OBJECT
+
+  public:
+    DeclarativeToolButton(QObject *parent = 0);
+};
+
 class DeclarativeWebView : public DeclarativeWidgetProxy<QWebView>
 {
   DECLARATIVE_OBJECT
diff --git a/declarativewidgetdocument.cpp b/declarativewidgetdocument.cpp
index e15242e..0f3e33c 100644
--- a/declarativewidgetdocument.cpp
+++ b/declarativewidgetdocument.cpp
@@ -78,6 +78,7 @@ DeclarativeWidgetDocument::DeclarativeWidgetDocument(const QUrl &url, QObject *p
   qmlRegisterType<DeclarativeTextEdit>("QtGui", 1, 0, "TextEdit");
   qmlRegisterType<DeclarativeTimeEdit>("QtGui", 1, 0, "TimeEdit");
   qmlRegisterType<DeclarativeToolBar>("QtGui", 1, 0, "ToolBar");
+  qmlRegisterType<DeclarativeToolButton>("QtGui", 1, 0, "ToolButton");
   qmlRegisterType<DeclarativeWebView>("QtGui", 1, 0, "WebView");
   qmlRegisterType<DeclarativeWidget>("QtGui", 1, 0, "Widget");
 
diff --git a/gallery.qml b/gallery.qml
index da903e3..a30d5c3 100644
--- a/gallery.qml
+++ b/gallery.qml
@@ -12,6 +12,10 @@ TabWidget {
         text: qsTr("PushButton")
       }
 
+      ToolButton {
+        text: qsTr("ToolButton")
+      }
+
       CheckBox {
         text: qsTr("CheckBox")
       }
diff --git a/qwidgets.list b/qwidgets.list
index c15dc06..7ea83ba 100644
--- a/qwidgets.list
+++ b/qwidgets.list
@@ -39,7 +39,6 @@ qtableview.h
 qtablewidget.h
 qtabwidget.h
 qtoolbox.h
-qtoolbutton.h
 qtreeview.h
 qtreewidget.h
 qundoview.h