From 5474495acde035cdc54f532c7f378419b3b15e17 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 21 Mar 2022 10:33:28 +0100 Subject: [PATCH] Utils: Fix build with Qt5 Amends 2b286c755bc5e6070ed034d9974b9c670268619c. Change-Id: I7f28cb4ac0d5b515df1e46c1f514a0275472d438 Reviewed-by: David Schulz --- src/libs/utils/infobar.cpp | 2 +- src/plugins/mcusupport/mcukitmanager.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libs/utils/infobar.cpp b/src/libs/utils/infobar.cpp index fc68de95b17..efe1268f5d4 100644 --- a/src/libs/utils/infobar.cpp +++ b/src/libs/utils/infobar.cpp @@ -318,7 +318,7 @@ void InfoBarDisplay::update() auto cb = new QComboBox(); for (const InfoBarEntry::ComboInfo &comboInfo : qAsConst(info.m_comboInfo)) cb->addItem(comboInfo.displayText, comboInfo.data); - connect(cb, &QComboBox::currentIndexChanged, [cb, info]() { + connect(cb, QOverload::of(&QComboBox::currentIndexChanged), [cb, info]() { info.m_comboCallBack({cb->currentText(), cb->currentData()}); }); diff --git a/src/plugins/mcusupport/mcukitmanager.h b/src/plugins/mcusupport/mcukitmanager.h index e4dedc8c560..025a569e848 100644 --- a/src/plugins/mcusupport/mcukitmanager.h +++ b/src/plugins/mcusupport/mcukitmanager.h @@ -80,3 +80,5 @@ void removeOutdatedKits(); } // namespace McuKitManager } // namespace Internal } // namespace McuSupport + +Q_DECLARE_METATYPE(McuSupport::Internal::McuKitManager::UpgradeOption)