diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2019-06-10 14:03:12 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2019-06-10 14:03:12 +0200 |
| commit | 7ded94bf0eb2b78f37bb9f84a0cc36e4ec520023 (patch) | |
| tree | 605914378f8c640e6b7aaf098f5a4866e3278886 /src/quicktemplates2 | |
| parent | 324ec97aa256549c56d506fd96c1e06c35fed1ae (diff) | |
SplitView: fix preferredHeight not being restored in restoreState()
Change-Id: Icc236494f5df382d6bc49092d23a460822c835a1
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/quicktemplates2')
| -rw-r--r-- | src/quicktemplates2/qquicksplitview.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quicktemplates2/qquicksplitview.cpp b/src/quicktemplates2/qquicksplitview.cpp index 2c02d442..d1e7a8ae 100644 --- a/src/quicktemplates2/qquicksplitview.cpp +++ b/src/quicktemplates2/qquicksplitview.cpp @@ -1224,13 +1224,13 @@ QVariant QQuickSplitView::saveState() cborMap[QLatin1String("preferredWidth")] = static_cast<double>(attachedPrivate->m_preferredWidth); qCDebug(qlcQQuickSplitViewState).nospace() << "- wrote preferredWidth of " - << attachedPrivate->m_preferredWidth << " for split item at index " << i; + << attachedPrivate->m_preferredWidth << " for split item " << item << " at index " << i; } if (attachedPrivate->m_isPreferredHeightSet) { cborMap[QLatin1String("preferredHeight")] = static_cast<double>(attachedPrivate->m_preferredHeight); qCDebug(qlcQQuickSplitViewState).nospace() << "- wrote preferredHeight of " - << attachedPrivate->m_preferredHeight << " for split item at index " << i; + << attachedPrivate->m_preferredHeight << " for split item " << item << " at index " << i; } cborArray.append(cborMap); @@ -1280,7 +1280,7 @@ bool QQuickSplitView::restoreState(const QVariant &state) QCborMap cborMap(it->toMap()); const int splitItemIndex = cborMap.value(QLatin1String("index")).toInteger(); const bool isPreferredWidthSet = cborMap.contains(QLatin1String("preferredWidth")); - const bool isPreferredHeightSet = cborMap.contains(QLatin1String("preferredWidth")); + const bool isPreferredHeightSet = cborMap.contains(QLatin1String("preferredHeight")); QQuickItem *item = qobject_cast<QQuickItem*>(d->contentModel->object(splitItemIndex)); // If the split item does not have a preferred size specified in QML, it could still have @@ -1299,7 +1299,7 @@ bool QQuickSplitView::restoreState(const QVariant &state) const QQuickSplitViewAttachedPrivate *attachedPrivate = QQuickSplitViewAttachedPrivate::get(attached); qCDebug(qlcQQuickSplitViewState).nospace() - << "- restored the following state for split item at index " << splitItemIndex + << "- restored the following state for split item " << item << " at index " << splitItemIndex << ": preferredWidthSet=" << attachedPrivate->m_isPreferredWidthSet << " preferredWidth=" << attachedPrivate->m_preferredWidth << " preferredHeightSet=" << attachedPrivate->m_isPreferredHeightSet |