From 044faadc2da017cef60fcd1f8891e45cfb4842f4 Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Tue, 7 Jul 2020 14:18:09 +0200
Subject: [PATCH] QmlDesigner: Fix crash with ADS

When pressing Ctrl + Shift + F in design mode the OutputPanePlaceHolder
is requesting its splitter, which isn't set with ADS. To avoid nullptr
access a check for the splitter before accessing.

Change-Id: I3085bba23d4cf9bddcfec154e4557000d880600d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/coreplugin/outputpane.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index 4b2f4556a8e..ecf52909700 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -176,6 +176,8 @@ void OutputPanePlaceHolder::setHeight(int height)
 
 void OutputPanePlaceHolder::ensureSizeHintAsMinimum()
 {
+    if (!d->m_splitter)
+        return;
     Internal::OutputPaneManager *om = Internal::OutputPaneManager::instance();
     int minimum = (d->m_splitter->orientation() == Qt::Vertical
                    ? om->sizeHint().height() : om->sizeHint().width());