From 90027cd298359a70f35b6feca98609a3c7fc67e3 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Thu, 26 Aug 2021 16:03:35 +0200 Subject: [PATCH] Add Qt 6 ifdef for a DesignerWindowManager call That code path cannot be hit with Qt 6 anyhow. Change-Id: I6f8e2a1a3606a4e6fbaa10f650fc5f22354f48a8 Reviewed-by: Miikka Heikkinen --- .../qml2puppet/instances/qt5nodeinstanceclientproxy.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp index 6c914bf3ea8..1e8828f6849 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceclientproxy.cpp @@ -58,18 +58,15 @@ Qt5NodeInstanceClientProxy::Qt5NodeInstanceClientProxy(QObject *parent) : NodeInstanceClientProxy(parent) { prioritizeDown(); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - const bool qt6 = false; -#else - const bool qt6 = true; -#endif const bool unifiedRenderPath = qEnvironmentVariableIsSet("QMLPUPPET_UNIFIED_RENDER_PATH"); if (unifiedRenderPath) Internal::QuickItemNodeInstance::enableUnifiedRenderPath(true); - else if (!qt6) +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + else DesignerSupport::activateDesignerWindowManager(); +#endif if (QCoreApplication::arguments().at(1) == QLatin1String("--readcapturedstream")) { qputenv("DESIGNER_DONT_USE_SHARED_MEMORY", "1");