diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-08 01:00:09 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2019-11-08 08:16:27 +0100 |
| commit | 53db1ef8d6a40484a1fc8633b2bad9fb2405c08a (patch) | |
| tree | fd922515894c0c0c6c565bb6dad655b62d84cd90 /src/imports/layouts/qquicklinearlayout.cpp | |
| parent | 8e380f6199df1cbaf5d88d929e648a5368f6e0ef (diff) | |
| parent | 210f4271e8946c0da0cefff0c07af80081df20f1 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp
Change-Id: I1c0c7c44053bf3d5f8f9723662bd0fe67253c8ae
Diffstat (limited to 'src/imports/layouts/qquicklinearlayout.cpp')
| -rw-r--r-- | src/imports/layouts/qquicklinearlayout.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/imports/layouts/qquicklinearlayout.cpp b/src/imports/layouts/qquicklinearlayout.cpp index af7b1b7340..c6c9685ae2 100644 --- a/src/imports/layouts/qquicklinearlayout.cpp +++ b/src/imports/layouts/qquicklinearlayout.cpp @@ -283,8 +283,11 @@ Qt::LayoutDirection QQuickGridLayoutBase::layoutDirection() const void QQuickGridLayoutBase::setLayoutDirection(Qt::LayoutDirection dir) { Q_D(QQuickGridLayoutBase); + if (d->m_layoutDirection == dir) + return; d->m_layoutDirection = dir; invalidate(); + emit layoutDirectionChanged(); } Qt::LayoutDirection QQuickGridLayoutBase::effectiveLayoutDirection() const @@ -524,6 +527,7 @@ void QQuickGridLayout::setColumnSpacing(qreal spacing) d->engine.setSpacing(spacing, Qt::Horizontal); invalidate(); + emit columnSpacingChanged(); } /*! @@ -546,6 +550,7 @@ void QQuickGridLayout::setRowSpacing(qreal spacing) d->engine.setSpacing(spacing, Qt::Vertical); invalidate(); + emit rowSpacingChanged(); } /*! @@ -817,6 +822,7 @@ void QQuickLinearLayout::setSpacing(qreal space) d->engine.setSpacing(space, Qt::Horizontal | Qt::Vertical); invalidate(); + emit spacingChanged(); } void QQuickLinearLayout::insertLayoutItems() |