Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: I828b8ea2fef35e4e7ab0bb594e683f8643c793a1

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)