From 6efb484868a9d3efbb5dab51911b248f94139f56 Mon Sep 17 00:00:00 2001
From: Knud Dollereder <knud.dollereder@qt.io>
Date: Wed, 2 Dec 2020 14:55:00 +0100
Subject: [PATCH] Create zoomaction widget for the live-preview

Fixes: QDS-3203
Change-Id: I460fdc5882ff22c6a8c590402e0efe06dece435a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../components/componentcore/zoomaction.cpp           | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/plugins/qmldesigner/components/componentcore/zoomaction.cpp b/src/plugins/qmldesigner/components/componentcore/zoomaction.cpp
index 024dd605028..af4f6edac82 100644
--- a/src/plugins/qmldesigner/components/componentcore/zoomaction.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/zoomaction.cpp
@@ -113,14 +113,9 @@ double ZoomAction::setPreviousZoomFactor(double zoom)
     return zoom;
 }
 
-bool parentIsFormEditor(QWidget *parent)
+bool parentIsToolBar(QWidget *parent)
 {
-    while (parent) {
-        if (qobject_cast<FormEditorWidget *>(parent))
-            return true;
-        parent = qobject_cast<QWidget *>(parent->parent());
-    }
-    return false;
+    return qobject_cast<QToolBar *>(parent) != nullptr;
 }
 
 QComboBox *createZoomComboBox(QWidget *parent)
@@ -135,7 +130,7 @@ QComboBox *createZoomComboBox(QWidget *parent)
 
 QWidget *ZoomAction::createWidget(QWidget *parent)
 {
-    if (!m_combo && parentIsFormEditor(parent)) {
+    if (!m_combo && parentIsToolBar(parent)) {
         m_combo = createZoomComboBox(parent);
         m_combo->setProperty("hideborder", true);
         m_combo->setCurrentIndex(indexOf(1.0));