feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix build: contextless QObject::connect are not permitted

Browse Source 
The Qt6UiPlugin cmake file defines QT_NO_CONTEXTLESS_CONNECT as part of
its interface (I don't know why and don't care why), so remove the
contextless connections by adding context.

formeditor.cpp:363:21: error: no matching function for call to ‘Designer::Internal::FormEditorData::connect(Core::EditorManager*, void (Core::EditorManager::*)(QList<Core::IEditor*>), Designer::Internal::FormEditorData::fullInit()::<lambda(QList<Core::IEditor*>)>)’
formeditor.cpp:490:21: error: no matching function for call to ‘Designer::Internal::FormEditorData::connect(QAction*&, void (QAction::*)(bool), Designer::Internal::FormEditorData::setupActions()::<lambda()>)’

Change-Id: Ib84fc618ac204205bf7afffd1773ef41ee3e7fdd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Thiago Macieira
2023-07-21 09:35:51 -07:00
committed by Jarek Kobus
parent de4c1adbfa
commit 93de403391
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/designer/formeditor.cpp
View File

@@ -230,7 +230,7 @@ FormEditorData::FormEditorData() :
m_settingsPages.append(settingsPage); m_settingsPages.append(settingsPage);
} }
QObject::connect(EditorManager::instance(), &EditorManager::currentEditorChanged, [this](IEditor *editor) { QObject::connect(EditorManager::instance(), &EditorManager::currentEditorChanged, this, [this](IEditor *editor) {
if (Designer::Constants::Internal::debug) if (Designer::Constants::Internal::debug)
qDebug() << Q_FUNC_INFO << editor << " of " << m_fwm->formWindowCount(); qDebug() << Q_FUNC_INFO << editor << " of " << m_fwm->formWindowCount();
@@ -360,7 +360,7 @@ void FormEditorData::fullInit()
delete initTime; delete initTime;
} }
QObject::connect(EditorManager::instance(), &EditorManager::editorsClosed, QObject::connect(EditorManager::instance(), &EditorManager::editorsClosed, this,
[this] (const QList<IEditor *> editors) { [this] (const QList<IEditor *> editors) {
for (IEditor *editor : editors) for (IEditor *editor : editors)
m_editorWidget->removeFormWindowEditor(editor); m_editorWidget->removeFormWindowEditor(editor);
@@ -487,7 +487,7 @@ void FormEditorData::setupActions()
m_actionPrint = new QAction(this); m_actionPrint = new QAction(this);
bindShortcut(ActionManager::registerAction(m_actionPrint, Core::Constants::PRINT, m_contexts), m_actionPrint); bindShortcut(ActionManager::registerAction(m_actionPrint, Core::Constants::PRINT, m_contexts), m_actionPrint);
QObject::connect(m_actionPrint, &QAction::triggered, [this]() { print(); }); QObject::connect(m_actionPrint, &QAction::triggered, this, [this] { print(); });
//'delete' action. Do not set a shortcut as Designer handles //'delete' action. Do not set a shortcut as Designer handles
// the 'Delete' key by event filter. Setting a shortcut triggers // the 'Delete' key by event filter. Setting a shortcut triggers
@@ -500,7 +500,7 @@ void FormEditorData::setupActions()
m_actionGroupEditMode = new QActionGroup(this); m_actionGroupEditMode = new QActionGroup(this);
m_actionGroupEditMode->setExclusive(true); m_actionGroupEditMode->setExclusive(true);
QObject::connect(m_actionGroupEditMode, &QActionGroup::triggered, QObject::connect(m_actionGroupEditMode, &QActionGroup::triggered, this,
[this](QAction *a) { activateEditMode(a->data().toInt()); }); [this](QAction *a) { activateEditMode(a->data().toInt()); });
medit->addSeparator(m_contexts, Core::Constants::G_EDIT_OTHER); medit->addSeparator(m_contexts, Core::Constants::G_EDIT_OTHER);
@@ -605,7 +605,7 @@ void FormEditorData::setupActions()
m_actionAboutPlugins->setEnabled(false); m_actionAboutPlugins->setEnabled(false);
// FWM // FWM
QObject::connect(m_fwm, &QDesignerFormWindowManagerInterface::activeFormWindowChanged, QObject::connect(m_fwm, &QDesignerFormWindowManagerInterface::activeFormWindowChanged, this,
[this] (QDesignerFormWindowInterface *afw) { [this] (QDesignerFormWindowInterface *afw) {
m_fwm->closeAllPreviews(); m_fwm->closeAllPreviews();
setPreviewMenuEnabled(afw != nullptr); setPreviewMenuEnabled(afw != nullptr);
@@ -739,7 +739,7 @@ IEditor *FormEditorData::createEditor()
QDesignerFormWindowInterface *form = m_fwm->createFormWindow(nullptr); QDesignerFormWindowInterface *form = m_fwm->createFormWindow(nullptr);
QTC_ASSERT(form, return nullptr); QTC_ASSERT(form, return nullptr);
form->setPalette(Theme::initialPalette()); form->setPalette(Theme::initialPalette());
QObject::connect(form, &QDesignerFormWindowInterface::toolChanged, [this] (int i) { toolChanged(i); }); QObject::connect(form, &QDesignerFormWindowInterface::toolChanged, this, [this](int i) { toolChanged(i); });
auto widgetHost = new SharedTools::WidgetHost( /* parent */ nullptr, form); auto widgetHost = new SharedTools::WidgetHost( /* parent */ nullptr, form);
FormWindowEditor *formWindowEditor = m_xmlEditorFactory->create(form); FormWindowEditor *formWindowEditor = m_xmlEditorFactory->create(form);