From 5fe7b3ad6a2a5cca1dd45f7e15bd5d1bf94fd8df Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 18 May 2022 08:58:43 +0200 Subject: [PATCH] QmlProjectManager: Do not establish connecttions when using Qt5 Amends 8bb1a862a06. Change-Id: I4186dda881f06295788e1fe4d6165c999fdbe574 Reviewed-by: Alessandro Portale --- src/plugins/qmlprojectmanager/qdslandingpage.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/plugins/qmlprojectmanager/qdslandingpage.cpp b/src/plugins/qmlprojectmanager/qdslandingpage.cpp index 5a70036b824..f56d60e627d 100644 --- a/src/plugins/qmlprojectmanager/qdslandingpage.cpp +++ b/src/plugins/qmlprojectmanager/qdslandingpage.cpp @@ -51,11 +51,13 @@ QdsLandingPage::QdsLandingPage(QWidget *parent) m_dialog->engine()->addImportPath(resourcePath); m_dialog->setSource(QUrl::fromLocalFile(landingPath + "/main.qml")); - connect(m_dialog->rootObject(), SIGNAL(openQtc(bool)), this, SIGNAL(openCreator(bool))); - connect(m_dialog->rootObject(), SIGNAL(openQds(bool)), this, SIGNAL(openDesigner(bool))); - connect(m_dialog->rootObject(), SIGNAL(installQds()), this, SIGNAL(installDesigner())); - connect(m_dialog->rootObject(), SIGNAL(generateCmake()), this, SIGNAL(generateCmake())); - connect(m_dialog->rootObject(), SIGNAL(generateProjectFile()), this, SIGNAL(generateProjectFile())); + if (m_dialog->rootObject()) { // main.qml only works with Qt6 + connect(m_dialog->rootObject(), SIGNAL(openQtc(bool)), this, SIGNAL(openCreator(bool))); + connect(m_dialog->rootObject(), SIGNAL(openQds(bool)), this, SIGNAL(openDesigner(bool))); + connect(m_dialog->rootObject(), SIGNAL(installQds()), this, SIGNAL(installDesigner())); + connect(m_dialog->rootObject(), SIGNAL(generateCmake()), this, SIGNAL(generateCmake())); + connect(m_dialog->rootObject(), SIGNAL(generateProjectFile()), this, SIGNAL(generateProjectFile())); + } m_dialog->hide(); }