Add support for Frame

diff --git a/declarativeobjects.cpp b/declarativeobjects.cpp
index a96a0d6..74fa375 100644 (file)
--- a/declarativeobjects.cpp
+++ b/declarativeobjects.cpp
@@ -874,6 +874,14 @@ DeclarativeFontDialog::DeclarativeFontDialog(QObject *parent) : DeclarativeWidge
 
 CUSTOM_METAOBJECT(DeclarativeFontDialog, QFontDialog)
 
+// DeclarativeFrame
+DeclarativeFrame::DeclarativeFrame(QObject *parent) : DeclarativeWidgetProxy<QFrame>(parent)
+{
+  connectAllSignals(m_proxiedObject, this);
+}
+
+CUSTOM_METAOBJECT(DeclarativeFrame, QFrame)
+
 // DeclarativeInputDialog
 DeclarativeInputDialogAttached::DeclarativeInputDialogAttached(QObject *parent) : QObject(parent)
 {

diff --git a/declarativeobjects_p.h b/declarativeobjects_p.h
index 89efa6d..b7b098c 100644 (file)
--- a/declarativeobjects_p.h
+++ b/declarativeobjects_p.h
@@ -533,6 +533,14 @@ class DeclarativeFontDialog : public DeclarativeWidgetProxy<QFontDialog>
     DeclarativeFontDialog(QObject *parent = 0);
 };
 
+class DeclarativeFrame : public DeclarativeWidgetProxy<QFrame>
+{
+  DECLARATIVE_OBJECT
+
+  public:
+    DeclarativeFrame(QObject *parent = 0);
+};
+
 class DeclarativeInputDialogAttached : public QObject
 {
   Q_OBJECT

diff --git a/declarativewidgetdocument.cpp b/declarativewidgetdocument.cpp
index e2ff173..026904a 100644 (file)
--- a/declarativewidgetdocument.cpp
+++ b/declarativewidgetdocument.cpp
@@ -54,6 +54,7 @@ DeclarativeWidgetDocument::DeclarativeWidgetDocument(const QUrl &url, QObject *p
   qmlRegisterType<DeclarativeFileDialogAttached>();
   qmlRegisterType<DeclarativeFileDialog>("QtGui", 1, 0, "FileDialog");
   qmlRegisterType<DeclarativeFontDialog>("QtGui", 1, 0, "FontDialog");
+  qmlRegisterType<DeclarativeFrame>("QtGui", 1, 0, "Frame");
   qmlRegisterType<DeclarativeInputDialogAttached>();
   qmlRegisterType<DeclarativeInputDialog>("QtGui", 1, 0, "InputDialog");
   qmlRegisterType<DeclarativeLabel>("QtGui", 1, 0, "Label");

diff --git a/gallery.qml b/gallery.qml
index f7b90b6..77a91a2 100644 (file)
--- a/gallery.qml
+++ b/gallery.qml
@@ -7,5 +7,11 @@ Widget {
     LineEdit {
       onTextChanged: console.log("Types: " + text)
     }
+    Frame {
+      frameShape: Frame.Panel
+      frameShadow: Frame.Sunken
+      minimumWidth: 100
+      minimumHeight: 100
+    }
   }
 }

diff --git a/qwidgets.list b/qwidgets.list
index 66d4d35..be37b09 100644 (file)
--- a/qwidgets.list
+++ b/qwidgets.list
@@ -16,7 +16,6 @@ qdial.h
 qdockwidget.h
 qfocusframe.h
 qfontcombobox.h
-qframe.h
 qgraphicsview.h
 qgraphicswidget.h
 qgroupbox.h