summaryrefslogtreecommitdiffstats
path: root/src/gui/graphicsview/qgraphicswidget.h
diff options
context:
space:
mode:
authorBill King <bill.king@nokia.com>2009-11-09 23:21:25 (GMT)
committerBill King <bill.king@nokia.com>2009-11-09 23:21:25 (GMT)
commite80adac9902abfd423aae23dd22f490a33763228 (patch)
tree63cc04b5546454fcf668125169c6793fcdbdf04c /src/gui/graphicsview/qgraphicswidget.h
parent87fb186c553d0875c92938a6fd5a9aaf8d69a057 (diff)
parentb770abdd564f28a8d9dde816f72f73e6b15984af (diff)
downloadQt-e80adac9902abfd423aae23dd22f490a33763228.zip
Qt-e80adac9902abfd423aae23dd22f490a33763228.tar.gz
Qt-e80adac9902abfd423aae23dd22f490a33763228.tar.bz2
Merge branch '4.6' of ../qt into 4.6
Diffstat (limited to 'src/gui/graphicsview/qgraphicswidget.h')
-rw-r--r--src/gui/graphicsview/qgraphicswidget.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicswidget.h b/src/gui/graphicsview/qgraphicswidget.h
index 9c71140..05d3a49 100644
--- a/src/gui/graphicsview/qgraphicswidget.h
+++ b/src/gui/graphicsview/qgraphicswidget.h
@@ -74,6 +74,10 @@ class Q_GUI_EXPORT QGraphicsWidget : public QGraphicsObject, public QGraphicsLay
Q_PROPERTY(QFont font READ font WRITE setFont)
Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection RESET unsetLayoutDirection)
Q_PROPERTY(QSizeF size READ size WRITE resize)
+ Q_PROPERTY(QSizeF minimumSize READ minimumSize WRITE setMinimumSize)
+ Q_PROPERTY(QSizeF preferredSize READ preferredSize WRITE setPreferredSize)
+ Q_PROPERTY(QSizeF maximumSize READ maximumSize WRITE setMaximumSize)
+ Q_PROPERTY(QSizePolicy sizePolicy READ sizePolicy WRITE setSizePolicy)
Q_PROPERTY(Qt::FocusPolicy focusPolicy READ focusPolicy WRITE setFocusPolicy)
Q_PROPERTY(Qt::WindowFlags windowFlags READ windowFlags WRITE setWindowFlags)
Q_PROPERTY(QString windowTitle READ windowTitle WRITE setWindowTitle)