diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-15 03:00:30 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-15 03:00:30 +0200 |
| commit | 333466e4e335d5cfd6d7b2bad143bbe9e2efbab6 (patch) | |
| tree | 35ffb338369c68018633af36f57ce9da2e94ea08 /src | |
| parent | 467aa59a88d381dddb0e5b797c73f205d0b275c9 (diff) | |
| parent | b00d649f109b080b7068c4a7a2a7731d7fb51ea1 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Id8cb931daffd3dd0f75c283a9adb98ddc976973b
Diffstat (limited to 'src')
| -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 |