diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:22:58 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:22:58 +0100 |
| commit | 0f52a81f27e4ab8144e8784f04b190f23a4d49d9 (patch) | |
| tree | 0c69410fab38461c91212e94395252cadad9da09 /src/layouts | |
| parent | d3c935f52c48e2eb1440cd329eaa152c42d03c6f (diff) | |
| parent | 66e1e0fee78f2b0a4412927ad39df4be564d15d1 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
src/controls/Styles/Base/ComboBoxStyle.qml
src/controls/Styles/Desktop/ComboBoxStyle.qml
src/layouts/qgridlayoutengine.cpp
Change-Id: I14298b9b3521fe220248e4b27e7057d538af5c49
Diffstat (limited to 'src/layouts')
| -rw-r--r-- | src/layouts/qquicklinearlayout.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/layouts/qquicklinearlayout.cpp b/src/layouts/qquicklinearlayout.cpp index 2e9c3536e..d09a07dc4 100644 --- a/src/layouts/qquicklinearlayout.cpp +++ b/src/layouts/qquicklinearlayout.cpp @@ -534,7 +534,7 @@ QQuickGridLayout::QQuickGridLayout(QQuickItem *parent /* = 0*/) \qmlproperty real GridLayout::columnSpacing This property holds the spacing between each column. - The default value is \c 4. + The default value is \c 5. */ qreal QQuickGridLayout::columnSpacing() const { @@ -556,7 +556,7 @@ void QQuickGridLayout::setColumnSpacing(qreal spacing) \qmlproperty real GridLayout::rowSpacing This property holds the spacing between each row. - The default value is \c 4. + The default value is \c 5. */ qreal QQuickGridLayout::rowSpacing() const { @@ -827,13 +827,13 @@ QQuickLinearLayout::QQuickLinearLayout(Qt::Orientation orientation, \qmlproperty real RowLayout::spacing This property holds the spacing between each cell. - The default value is \c 4. + The default value is \c 5. */ /*! \qmlproperty real ColumnLayout::spacing This property holds the spacing between each cell. - The default value is \c 4. + The default value is \c 5. */ qreal QQuickLinearLayout::spacing() const |