diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-18 03:00:25 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-18 03:00:25 +0200 |
commit | b88941e62c533474f4658a212133089e04863673 (patch) | |
tree | 3ac4972086a5de89989c4a2f372eb70f03d692aa | |
parent | ebfcc404a172160baccd67fa72f8199b78ff5141 (diff) | |
parent | 1876c17c354cf60160f408950bb6e5cc4a4f879e (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I828b8ea2fef35e4e7ab0bb594e683f8643c793a1
-rw-r--r-- | src/imports/platform/qquickplatformcolordialog.cpp | 2 | ||||
-rw-r--r-- | src/quicktemplates2/qquickstackview_p.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/platform/qquickplatformcolordialog.cpp b/src/imports/platform/qquickplatformcolordialog.cpp index 9b0283d0..0b8cfd97 100644 --- a/src/imports/platform/qquickplatformcolordialog.cpp +++ b/src/imports/platform/qquickplatformcolordialog.cpp @@ -185,8 +185,8 @@ void QQuickPlatformColorDialog::onCreate(QPlatformDialogHelper *dialog) { if (QPlatformColorDialogHelper *colorDialog = qobject_cast<QPlatformColorDialogHelper *>(dialog)) { connect(colorDialog, &QPlatformColorDialogHelper::currentColorChanged, this, &QQuickPlatformColorDialog::currentColorChanged); - colorDialog->setCurrentColor(m_currentColor); colorDialog->setOptions(m_options); + colorDialog->setCurrentColor(m_currentColor); } } diff --git a/src/quicktemplates2/qquickstackview_p.cpp b/src/quicktemplates2/qquickstackview_p.cpp index e0e1d9ef..3d6afa9f 100644 --- a/src/quicktemplates2/qquickstackview_p.cpp +++ b/src/quicktemplates2/qquickstackview_p.cpp @@ -272,7 +272,7 @@ void QQuickStackViewPrivate::viewItemTransitionFinished(QQuickItemViewTransition removed += element; } - if (transitioner->runningJobs.isEmpty()) { + if (transitioner && transitioner->runningJobs.isEmpty()) { // ~QQuickStackElement() emits QQuickStackViewAttached::removed(), which may be used // to modify the stack. Set the status first and make a copy of the destroyable stack // elements to exclude any modifications that may happen during the loop. (QTBUG-62153) |