diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2014-03-29 23:31:48 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-31 12:04:37 +0200 |
| commit | 644728a2120880c2f8c9b32ce496efd6158a1107 (patch) | |
| tree | fba7c055e0d0a7fc59ecdcceb2d93e50064cae5c | |
| parent | f99dcdf07733b1cffeab89edb0fe0908cb753bd5 (diff) | |
| download | qtquickcontrols-644728a2120880c2f8c9b32ce496efd6158a1107.tar.gz | |
Doc: Fix some issues
Change-Id: I2f209fc33fdeecf0a3a3067486f9f4abfe18a2ec
Reviewed-by: Martin Smith <martin.smith@digia.com>
| -rw-r--r-- | src/controls/ApplicationWindow.qml | 2 | ||||
| -rw-r--r-- | src/controls/Private/qquickabstractstyle.cpp | 1 | ||||
| -rw-r--r-- | src/controls/Private/qquickstyleitem_p.h | 4 | ||||
| -rw-r--r-- | src/controls/Styles/Base/ButtonStyle.qml | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index bb969946..ec40d4fe 100644 --- a/src/controls/ApplicationWindow.qml +++ b/src/controls/ApplicationWindow.qml @@ -118,7 +118,7 @@ Window { // The below documentation was supposed to be written as a grouped property, but qdoc would // not render it correctly due to a bug (https://bugreports.qt-project.org/browse/QTBUG-34206) /*! - \qmlproperty ApplicationWindow::contentItem + \qmlproperty ContentItem ApplicationWindow::contentItem This group holds the size constraints of the content item. This is the area between the \l ToolBar and the \l StatusBar. diff --git a/src/controls/Private/qquickabstractstyle.cpp b/src/controls/Private/qquickabstractstyle.cpp index eba57b03..404e7bb1 100644 --- a/src/controls/Private/qquickabstractstyle.cpp +++ b/src/controls/Private/qquickabstractstyle.cpp @@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE */ /*! + \qmlpropertygroup QtQuick.Controls.Styles::AbstractStyle::padding \qmlproperty int AbstractStyle::padding.top \qmlproperty int AbstractStyle::padding.left \qmlproperty int AbstractStyle::padding.right diff --git a/src/controls/Private/qquickstyleitem_p.h b/src/controls/Private/qquickstyleitem_p.h index 8d296f25..9146ad52 100644 --- a/src/controls/Private/qquickstyleitem_p.h +++ b/src/controls/Private/qquickstyleitem_p.h @@ -91,8 +91,8 @@ class QQuickStyleItem: public QQuickItem Q_PROPERTY( int step READ step WRITE setStep NOTIFY stepChanged) Q_PROPERTY( int paintMargins READ paintMargins WRITE setPaintMargins NOTIFY paintMarginsChanged) - Q_PROPERTY( int contentWidth READ contentWidth() WRITE setContentWidth NOTIFY contentWidthChanged) - Q_PROPERTY( int contentHeight READ contentHeight() WRITE setContentHeight NOTIFY contentHeightChanged) + Q_PROPERTY( int contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged) + Q_PROPERTY( int contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged) Q_PROPERTY( int textureWidth READ textureWidth WRITE setTextureWidth NOTIFY textureWidthChanged) Q_PROPERTY( int textureHeight READ textureHeight WRITE setTextureHeight NOTIFY textureHeightChanged) diff --git a/src/controls/Styles/Base/ButtonStyle.qml b/src/controls/Styles/Base/ButtonStyle.qml index 35f6bd9b..92ee6395 100644 --- a/src/controls/Styles/Base/ButtonStyle.qml +++ b/src/controls/Styles/Base/ButtonStyle.qml @@ -76,7 +76,7 @@ import QtQuick.Controls.Private 1.0 Style { id: buttonstyle - /*! The \l Button attached to this style. */ + /*! The \l {QtQuick.Controls::}{Button} attached to this style. */ readonly property Button control: __control /*! \internal */ |