diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-06 22:18:47 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-06 22:18:47 (GMT) |
| commit | f5d6f539c6b2a8ff7f9f2f4297f6cd3e6309493f (patch) | |
| tree | 791e061395d8a856513f54b9a10a1a63c544cc9d /src/gui | |
| parent | 7ee944a14582cd7202b4a8e94adc06e7ae5855a6 (diff) | |
| parent | 76a0ea27dd4e377ab5d32c7559f4b9700cd5618a (diff) | |
| download | Qt-f5d6f539c6b2a8ff7f9f2f4297f6cd3e6309493f.zip Qt-f5d6f539c6b2a8ff7f9f2f4297f6cd3e6309493f.tar.gz Qt-f5d6f539c6b2a8ff7f9f2f4297f6cd3e6309493f.tar.bz2 | |
Merge branch 'fixes' of git://gitorious.org/~morphbr/qt/morphbrs-clone into morpheuz-fixes
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/graphicsview/qgraphicswidget.cpp | 6 | ||||
| -rw-r--r-- | src/gui/graphicsview/qgraphicswidget.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp index 6f910c7..d9c65bb 100644 --- a/src/gui/graphicsview/qgraphicswidget.cpp +++ b/src/gui/graphicsview/qgraphicswidget.cpp @@ -318,6 +318,12 @@ void QGraphicsWidget::resize(const QSizeF &size) */ /*! + \property QGraphicsWidget::sizePolicy + \brief the size policy for the widget + \sa sizePolicy(), setSizePolicy(), QWidget::sizePolicy() +*/ + +/*! \property QGraphicsWidget::geometry \brief the geometry of the widget diff --git a/src/gui/graphicsview/qgraphicswidget.h b/src/gui/graphicsview/qgraphicswidget.h index 38f72f0..15dc878 100644 --- a/src/gui/graphicsview/qgraphicswidget.h +++ b/src/gui/graphicsview/qgraphicswidget.h @@ -77,6 +77,7 @@ class Q_GUI_EXPORT QGraphicsWidget : public QGraphicsObject, public QGraphicsLay 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::Policy 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) |