From 3749cfc89621236046dd7cbe89bc375a62bc0685 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Mon, 17 Jan 2022 16:47:31 +0100
Subject: [PATCH] InfoBar: Make adding more buttons possible

Change-Id: Ic0c946cf3f87fe46cd06391f38e0bc71374ad340
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/libs/utils/infobar.cpp                           | 12 +++++-------
 src/libs/utils/infobar.h                             | 11 ++++++++---
 src/plugins/android/androidmanifesteditorwidget.cpp  |  2 +-
 src/plugins/android/androidplugin.cpp                |  2 +-
 src/plugins/coreplugin/coreplugin.cpp                |  2 +-
 .../coreplugin/editormanager/editormanager.cpp       |  4 ++--
 src/plugins/coreplugin/find/searchresultwidget.cpp   |  2 +-
 src/plugins/coreplugin/vcsmanager.cpp                |  2 +-
 src/plugins/cppeditor/cppminimizableinfobars.cpp     |  2 +-
 src/plugins/designer/formeditorw.cpp                 |  2 +-
 .../diffeditor/diffeditorwidgetcontroller.cpp        |  2 +-
 src/plugins/mcusupport/mcusupportplugin.cpp          |  4 ++--
 src/plugins/python/pythonlanguageclient.cpp          | 10 ++++------
 src/plugins/qmljseditor/qmljseditordocument.cpp      |  2 +-
 src/plugins/qmlprojectmanager/qmlproject.cpp         |  2 +-
 src/plugins/qmlprojectmanager/qmlprojectplugin.cpp   |  2 +-
 src/plugins/qtsupport/qtsupportplugin.cpp            |  2 +-
 src/plugins/scxmleditor/scxmleditordata.cpp          |  2 +-
 src/plugins/texteditor/texteditor.cpp                |  6 +++---
 src/plugins/updateinfo/updateinfoplugin.cpp          |  2 +-
 src/plugins/webassembly/webassemblyplugin.cpp        |  2 +-
 src/plugins/welcome/introductionwidget.cpp           |  2 +-
 22 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/src/libs/utils/infobar.cpp b/src/libs/utils/infobar.cpp
index f481113b4eb..4e1255956a7 100644
--- a/src/libs/utils/infobar.cpp
+++ b/src/libs/utils/infobar.cpp
@@ -85,10 +85,9 @@ InfoBarEntry::InfoBarEntry(Id _id, const QString &_infoText, GlobalSuppression _
 {
 }
 
-void InfoBarEntry::setCustomButtonInfo(const QString &_buttonText, CallBack callBack)
+void InfoBarEntry::addCustomButton(const QString &buttonText, CallBack callBack)
 {
-    m_buttonText = _buttonText;
-    m_buttonCallBack = callBack;
+    m_buttons.append({buttonText, callBack});
 }
 
 void InfoBarEntry::setCancelButtonInfo(CallBack callBack)
@@ -317,11 +316,10 @@ void InfoBarDisplay::update()
             hbox->addWidget(cb);
         }
 
-        if (!info.m_buttonText.isEmpty()) {
+        for (const InfoBarEntry::Button &button : qAsConst(info.m_buttons)) {
             auto infoWidgetButton = new QToolButton;
-            infoWidgetButton->setText(info.m_buttonText);
-            connect(infoWidgetButton, &QAbstractButton::clicked, [info]() { info.m_buttonCallBack(); });
-
+            infoWidgetButton->setText(button.text);
+            connect(infoWidgetButton, &QAbstractButton::clicked, [button]() { button.callback(); });
             hbox->addWidget(infoWidgetButton);
         }
 
diff --git a/src/libs/utils/infobar.h b/src/libs/utils/infobar.h
index 2d168ed7123..9ba6e6a6b44 100644
--- a/src/libs/utils/infobar.h
+++ b/src/libs/utils/infobar.h
@@ -57,7 +57,7 @@ public:
     InfoBarEntry(Id _id, const QString &_infoText, GlobalSuppression _globalSuppression = GlobalSuppression::Disabled);
 
     using CallBack = std::function<void()>;
-    void setCustomButtonInfo(const QString &_buttonText, CallBack callBack);
+    void addCustomButton(const QString &_buttonText, CallBack callBack);
     void setCancelButtonInfo(CallBack callBack);
     void setCancelButtonInfo(const QString &_cancelButtonText, CallBack callBack);
     using ComboCallBack = std::function<void(const QString &)>;
@@ -68,10 +68,15 @@ public:
     void setDetailsWidgetCreator(const DetailsWidgetCreator &creator);
 
 private:
+    struct Button
+    {
+        QString text;
+        CallBack callback;
+    };
+
     Id m_id;
     QString m_infoText;
-    QString m_buttonText;
-    CallBack m_buttonCallBack;
+    QList<Button> m_buttons;
     QString m_cancelButtonText;
     CallBack m_cancelButtonCallBack;
     GlobalSuppression m_globalSuppression;
diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp
index e9c065ddd15..6f6a71241ae 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -746,7 +746,7 @@ void AndroidManifestEditorWidget::updateInfoBar(const QString &errorMessage, int
     else
         text = tr("%2: Could not parse file: \"%1\".").arg(errorMessage).arg(line);
     Utils::InfoBarEntry infoBarEntry(infoBarId, text);
-    infoBarEntry.setCustomButtonInfo(tr("Goto error"), [this]() {
+    infoBarEntry.addCustomButton(tr("Goto error"), [this]() {
         m_textEditorWidget->gotoLine(m_errorLine, m_errorColumn);
     });
     infoBar->removeInfo(infoBarId);
diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp
index 607cc79c70a..d0be5a319e6 100644
--- a/src/plugins/android/androidplugin.cpp
+++ b/src/plugins/android/androidplugin.cpp
@@ -195,7 +195,7 @@ void AndroidPlugin::askUserAboutAndroidSetup()
                 "Android kits can be usable and all essential packages are installed. "
                 "To do it later, select Options > Devices > Android."),
              Utils::InfoBarEntry::GlobalSuppression::Enabled);
-    info.setCustomButtonInfo(tr("Configure Android"), [this] {
+    info.addCustomButton(tr("Configure Android"), [this] {
         Core::ICore::infoBar()->removeInfo(kSetupAndroidSetting);
         Core::ICore::infoBar()->globallySuppressInfo(kSetupAndroidSetting);
         QTimer::singleShot(0, this, [this]() { d->potentialKit.executeFromMenu(); });
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index 26f03a5f48c..6b3195d16d7 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -415,7 +415,7 @@ void CorePlugin::warnAboutCrashReporing()
 
     Utils::InfoBarEntry info(kWarnCrashReportingSetting, warnStr,
                              Utils::InfoBarEntry::GlobalSuppression::Enabled);
-    info.setCustomButtonInfo(tr("Configure..."), [] {
+    info.addCustomButton(tr("Configure..."), [] {
         ICore::infoBar()->removeInfo(kWarnCrashReportingSetting);
         ICore::infoBar()->globallySuppressInfo(kWarnCrashReportingSetting);
         ICore::showOptionsDialog(Core::Constants::SETTINGS_ID_SYSTEM);
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index e2091ffe7fa..9d4e82f11b6 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -2034,12 +2034,12 @@ void EditorManagerPrivate::updateMakeWritableWarning()
                 InfoBarEntry info(Id(kMakeWritableWarning),
                                   tr("<b>Warning:</b> This file was not opened in %1 yet.")
                                   .arg(versionControl->displayName()));
-                info.setCustomButtonInfo(tr("Open"), &vcsOpenCurrentEditor);
+                info.addCustomButton(tr("Open"), &vcsOpenCurrentEditor);
                 document->infoBar()->addInfo(info);
             } else {
                 InfoBarEntry info(Id(kMakeWritableWarning),
                                   tr("<b>Warning:</b> You are changing a read-only file."));
-                info.setCustomButtonInfo(tr("Make Writable"), &makeCurrentEditorWritable);
+                info.addCustomButton(tr("Make Writable"), &makeCurrentEditorWritable);
                 document->infoBar()->addInfo(info);
             }
         } else {
diff --git a/src/plugins/coreplugin/find/searchresultwidget.cpp b/src/plugins/coreplugin/find/searchresultwidget.cpp
index e4b7c0ae85a..9e62153cf60 100644
--- a/src/plugins/coreplugin/find/searchresultwidget.cpp
+++ b/src/plugins/coreplugin/find/searchresultwidget.cpp
@@ -285,7 +285,7 @@ void SearchResultWidget::addResults(const QList<SearchResultItem> &items, Search
                           tr("The search resulted in more than %n items, do you still want to continue?",
                              nullptr, SEARCHRESULT_WARNING_LIMIT));
         info.setCancelButtonInfo(tr("Cancel"), [this]() { cancelAfterSizeWarning(); });
-        info.setCustomButtonInfo(tr("Continue"), [this]() { continueAfterSizeWarning(); });
+        info.addCustomButton(tr("Continue"), [this]() { continueAfterSizeWarning(); });
         m_infoBar.addInfo(info);
         emit requestPopup(false/*no focus*/);
     }
diff --git a/src/plugins/coreplugin/vcsmanager.cpp b/src/plugins/coreplugin/vcsmanager.cpp
index 20010a0f968..9258d81d441 100644
--- a/src/plugins/coreplugin/vcsmanager.cpp
+++ b/src/plugins/coreplugin/vcsmanager.cpp
@@ -308,7 +308,7 @@ IVersionControl* VcsManager::findVersionControlForDirectory(const FilePath &inpu
                                              .arg(versionControl->displayName()),
                                          Utils::InfoBarEntry::GlobalSuppression::Enabled);
                 d->m_unconfiguredVcs = versionControl;
-                info.setCustomButtonInfo(ICore::msgShowOptionsDialog(), []() {
+                info.addCustomButton(ICore::msgShowOptionsDialog(), []() {
                     QTC_ASSERT(d->m_unconfiguredVcs, return);
                     ICore::showOptionsDialog(d->m_unconfiguredVcs->id());
                  });
diff --git a/src/plugins/cppeditor/cppminimizableinfobars.cpp b/src/plugins/cppeditor/cppminimizableinfobars.cpp
index 317caac23df..7eb80622c0e 100644
--- a/src/plugins/cppeditor/cppminimizableinfobars.cpp
+++ b/src/plugins/cppeditor/cppminimizableinfobars.cpp
@@ -139,7 +139,7 @@ static InfoBarEntry createMinimizableInfo(const Id &id,
     // The minimizer() might delete the "Minimize" button immediately and as
     // result invalid reads will happen in QToolButton::mouseReleaseEvent().
     // Avoid this by running the minimizer in the next event loop iteration.
-    info.setCustomButtonInfo(MinimizableInfoBars::tr("Minimize"), [minimizer] {
+    info.addCustomButton(MinimizableInfoBars::tr("Minimize"), [minimizer] {
         QMetaObject::invokeMethod(settings(), [minimizer] { minimizer(); }, Qt::QueuedConnection);
     });
 
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index 971b038193f..63ed5917fb7 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -778,7 +778,7 @@ IEditor *FormEditorData::createEditor()
     if (formWindowEditor) {
         Utils::InfoBarEntry info(Id(Constants::INFO_READ_ONLY),
                                  tr("This file can only be edited in <b>Design</b> mode."));
-        info.setCustomButtonInfo(tr("Switch Mode"), []() { ModeManager::activateMode(Core::Constants::MODE_DESIGN); });
+        info.addCustomButton(tr("Switch Mode"), []() { ModeManager::activateMode(Core::Constants::MODE_DESIGN); });
         formWindowEditor->document()->infoBar()->addInfo(info);
     }
     return formWindowEditor;
diff --git a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
index 315249672ad..271ff5708ed 100644
--- a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
+++ b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp
@@ -315,7 +315,7 @@ void DiffEditorWidgetController::updateCannotDecodeInfo()
                                  tr("<b>Error:</b> Could not decode \"%1\" with \"%2\"-encoding.")
                                      .arg(m_document->displayName(),
                                           QString::fromLatin1(m_document->codec()->name())));
-        info.setCustomButtonInfo(tr("Select Encoding"), [this]() { m_document->selectEncoding(); });
+        info.addCustomButton(tr("Select Encoding"), [this]() { m_document->selectEncoding(); });
         infoBar->addInfo(info);
     } else {
         infoBar->removeInfo(selectEncodingId);
diff --git a/src/plugins/mcusupport/mcusupportplugin.cpp b/src/plugins/mcusupport/mcusupportplugin.cpp
index d004aa42dda..3e7db5e0ad7 100644
--- a/src/plugins/mcusupport/mcusupportplugin.cpp
+++ b/src/plugins/mcusupport/mcusupportplugin.cpp
@@ -114,7 +114,7 @@ void McuSupportPlugin::askUserAboutMcuSupportKitsSetup()
                              tr("Create Kits for Qt for MCUs? "
                                 "To do it later, select Options > Devices > MCU."),
                              Utils::InfoBarEntry::GlobalSuppression::Enabled);
-    info.setCustomButtonInfo(tr("Create Kits for Qt for MCUs"), [setupMcuSupportKits] {
+    info.addCustomButton(tr("Create Kits for Qt for MCUs"), [setupMcuSupportKits] {
         ICore::infoBar()->removeInfo(setupMcuSupportKits);
         QTimer::singleShot(0, []() { ICore::showOptionsDialog(Constants::SETTINGS_ID); });
     });
@@ -141,7 +141,7 @@ void McuSupportPlugin::askUserAboutMcuSupportKitsUpgrade()
                     McuSupportOptions::UpgradeOption::Replace;
     });
 
-    info.setCustomButtonInfo(tr("Proceed"), [upgradeMcuSupportKits] {
+    info.addCustomButton(tr("Proceed"), [upgradeMcuSupportKits] {
         ICore::infoBar()->removeInfo(upgradeMcuSupportKits);
         QTimer::singleShot(0, []() { McuSupportOptions::upgradeKits(selectedOption); });
     });
diff --git a/src/plugins/python/pythonlanguageclient.cpp b/src/plugins/python/pythonlanguageclient.cpp
index a0292f67978..ec82520f223 100644
--- a/src/plugins/python/pythonlanguageclient.cpp
+++ b/src/plugins/python/pythonlanguageclient.cpp
@@ -382,8 +382,8 @@ void PyLSConfigureAssistant::handlePyLSState(const FilePath &python,
         Utils::InfoBarEntry info(installPylsInfoBarId,
                                  message,
                                  Utils::InfoBarEntry::GlobalSuppression::Enabled);
-        info.setCustomButtonInfo(tr("Install"),
-                                 [=]() { installPythonLanguageServer(python, document); });
+        info.addCustomButton(tr("Install"),
+                             [=]() { installPythonLanguageServer(python, document); });
         infoBar->addInfo(info);
         m_infoBarEntries[python] << document;
     } else if (state.state == PythonLanguageServerState::AlreadyInstalled
@@ -394,8 +394,7 @@ void PyLSConfigureAssistant::handlePyLSState(const FilePath &python,
         Utils::InfoBarEntry info(startPylsInfoBarId,
                                  message,
                                  Utils::InfoBarEntry::GlobalSuppression::Enabled);
-        info.setCustomButtonInfo(tr("Set Up"),
-                                 [=]() { setupPythonLanguageServer(python, document); });
+        info.addCustomButton(tr("Set Up"), [=]() { setupPythonLanguageServer(python, document); });
         infoBar->addInfo(info);
         m_infoBarEntries[python] << document;
     } else if (state.state == PythonLanguageServerState::ConfiguredButDisabled
@@ -405,8 +404,7 @@ void PyLSConfigureAssistant::handlePyLSState(const FilePath &python,
         Utils::InfoBarEntry info(enablePylsInfoBarId,
                                  message,
                                  Utils::InfoBarEntry::GlobalSuppression::Enabled);
-        info.setCustomButtonInfo(tr("Enable"),
-                                 [=]() { enablePythonLanguageServer(python, document); });
+        info.addCustomButton(tr("Enable"), [=]() { enablePythonLanguageServer(python, document); });
         infoBar->addInfo(info);
         m_infoBarEntries[python] << document;
     }
diff --git a/src/plugins/qmljseditor/qmljseditordocument.cpp b/src/plugins/qmljseditor/qmljseditordocument.cpp
index 737631f9e95..770f79aa044 100644
--- a/src/plugins/qmljseditor/qmljseditordocument.cpp
+++ b/src/plugins/qmljseditor/qmljseditordocument.cpp
@@ -700,7 +700,7 @@ void QmlJSEditorDocument::setIsDesignModePreferred(bool value)
         if (infoBar()->canInfoBeAdded(QML_UI_FILE_WARNING)) {
             Utils::InfoBarEntry info(QML_UI_FILE_WARNING,
                                      tr("This file should only be edited in <b>Design</b> mode."));
-            info.setCustomButtonInfo(tr("Switch Mode"), []() {
+            info.addCustomButton(tr("Switch Mode"), []() {
                 Core::ModeManager::activateMode(Core::Constants::MODE_DESIGN);
             });
             infoBar()->addInfo(info);
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index 8e2dd6048e4..52d655bbe95 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -113,7 +113,7 @@ QmlProject::QmlProject(const Utils::FilePath &fileName)
                         info(openInQDSAppSetting,
                              tr("Would you like to open the project in Qt Design Studio?"),
                              Utils::InfoBarEntry::GlobalSuppression::Disabled);
-                    info.setCustomButtonInfo(tr("Open in Qt Design Studio"), [&, fileName] {
+                    info.addCustomButton(tr("Open in Qt Design Studio"), [&, fileName] {
                         Core::ICore::infoBar()->removeInfo(openInQDSAppSetting);
                         QmlProjectPlugin::openQDS(fileName);
                     });
diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
index 98526014955..ddc9462603b 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
@@ -212,7 +212,7 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
                                     info(openInQDSAppSetting,
                                          description + "\n" + tr("Do you want to open this file in Qt Design Studio?"),
                                          Utils::InfoBarEntry::GlobalSuppression::Disabled);
-                            info.setCustomButtonInfo(tr("Open in Qt Design Studio"), [filePath] {
+                            info.addCustomButton(tr("Open in Qt Design Studio"), [filePath] {
                                 Core::ICore::infoBar()->removeInfo(openInQDSAppSetting);
 
                                 if (findAndOpenProject(filePath)) {
diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp
index 54303161b33..5547a48f9d2 100644
--- a/src/plugins/qtsupport/qtsupportplugin.cpp
+++ b/src/plugins/qtsupport/qtsupportplugin.cpp
@@ -121,7 +121,7 @@ static void askAboutQtInstallation()
             "Link with a Qt installation to automatically register Qt versions and kits? To do "
             "this later, select Options > Kits > Qt Versions > Link with Qt."),
         Utils::InfoBarEntry::GlobalSuppression::Enabled);
-    info.setCustomButtonInfo(QtSupportPlugin::tr("Link with Qt"), [] {
+    info.addCustomButton(QtSupportPlugin::tr("Link with Qt"), [] {
         ICore::infoBar()->removeInfo(kLinkWithQtInstallationSetting);
         QTimer::singleShot(0, ICore::dialogParent(), &QtOptionsPage::linkWithQt);
     });
diff --git a/src/plugins/scxmleditor/scxmleditordata.cpp b/src/plugins/scxmleditor/scxmleditordata.cpp
index 7f823093075..89d780ca47b 100644
--- a/src/plugins/scxmleditor/scxmleditordata.cpp
+++ b/src/plugins/scxmleditor/scxmleditordata.cpp
@@ -163,7 +163,7 @@ IEditor *ScxmlEditorData::createEditor()
     if (xmlEditor) {
         Utils::InfoBarEntry info(Id(Constants::INFO_READ_ONLY),
                                  tr("This file can only be edited in <b>Design</b> mode."));
-        info.setCustomButtonInfo(tr("Switch Mode"), []() { ModeManager::activateMode(Core::Constants::MODE_DESIGN); });
+        info.addCustomButton(tr("Switch Mode"), []() { ModeManager::activateMode(Core::Constants::MODE_DESIGN); });
         xmlEditor->document()->infoBar()->addInfo(info);
     }
 
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 6eedf7f86ca..e642e2344ab 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -1599,7 +1599,7 @@ void TextEditorWidgetPrivate::updateCannotDecodeInfo()
         InfoBarEntry info(selectEncodingId,
             TextEditorWidget::tr("<b>Error:</b> Could not decode \"%1\" with \"%2\"-encoding. Editing not possible.")
                 .arg(m_document->displayName(), QString::fromLatin1(m_document->codec()->name())));
-        info.setCustomButtonInfo(TextEditorWidget::tr("Select Encoding"), [this]() { q->selectEncoding(); });
+        info.addCustomButton(TextEditorWidget::tr("Select Encoding"), [this]() { q->selectEncoding(); });
         infoBar->addInfo(info);
     } else {
         infoBar->removeInfo(selectEncodingId);
@@ -3234,7 +3234,7 @@ void TextEditorWidgetPrivate::updateSyntaxInfoBar(const Highlighter::Definitions
                           BaseTextEditor::tr("A highlight definition was not found for this file. "
                                              "Would you like to download additional highlight definition files?"),
                           InfoBarEntry::GlobalSuppression::Enabled);
-        info.setCustomButtonInfo(BaseTextEditor::tr("Download Definitions"), [missing, this]() {
+        info.addCustomButton(BaseTextEditor::tr("Download Definitions"), [missing, this]() {
             m_document->infoBar()->removeInfo(missing);
             Highlighter::downloadDefinitions();
         });
@@ -3250,7 +3250,7 @@ void TextEditorWidgetPrivate::updateSyntaxInfoBar(const Highlighter::Definitions
             this->configureGenericHighlighter(Highlighter::definitionForName(definition));
         });
 
-        info.setCustomButtonInfo(BaseTextEditor::tr("Remember My Choice"), [multiple, this]() {
+        info.addCustomButton(BaseTextEditor::tr("Remember My Choice"), [multiple, this]() {
             m_document->infoBar()->removeInfo(multiple);
             rememberCurrentSyntaxDefinition();
         });
diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp
index 4d393a298bb..edabb344064 100644
--- a/src/plugins/updateinfo/updateinfoplugin.cpp
+++ b/src/plugins/updateinfo/updateinfoplugin.cpp
@@ -206,7 +206,7 @@ void UpdateInfoPlugin::checkForUpdatesFinished()
             d->m_progress->setKeepOnFinish(FutureProgress::HideOnFinish);
         emit newUpdatesAvailable(true);
         Utils::InfoBarEntry info(InstallUpdates, tr("New updates are available. Start the update?"));
-        info.setCustomButtonInfo(tr("Start Update"), [this] {
+        info.addCustomButton(tr("Start Update"), [this] {
             Core::ICore::infoBar()->removeInfo(InstallUpdates);
             startUpdater();
         });
diff --git a/src/plugins/webassembly/webassemblyplugin.cpp b/src/plugins/webassembly/webassemblyplugin.cpp
index 527e6d8f549..a2cf03826e5 100644
--- a/src/plugins/webassembly/webassemblyplugin.cpp
+++ b/src/plugins/webassembly/webassemblyplugin.cpp
@@ -108,7 +108,7 @@ void WebAssemblyPlugin::askUserAboutEmSdkSetup()
                       tr("Setup Emscripten SDK for WebAssembly? "
                          "To do it later, select Options > Devices > WebAssembly."),
                       InfoBarEntry::GlobalSuppression::Enabled);
-    info.setCustomButtonInfo(tr("Setup Emscripten SDK"), [setupWebAssemblyEmSdk] {
+    info.addCustomButton(tr("Setup Emscripten SDK"), [setupWebAssemblyEmSdk] {
         ICore::infoBar()->removeInfo(setupWebAssemblyEmSdk);
         QTimer::singleShot(0, []() { ICore::showOptionsDialog(Constants::SETTINGS_ID); });
     });
diff --git a/src/plugins/welcome/introductionwidget.cpp b/src/plugins/welcome/introductionwidget.cpp
index 14286ba5305..6fc31990d20 100644
--- a/src/plugins/welcome/introductionwidget.cpp
+++ b/src/plugins/welcome/introductionwidget.cpp
@@ -60,7 +60,7 @@ void IntroductionWidget::askUserAboutIntroduction(QWidget *parent, QSettings *se
                 "interface elements and shows how they are used. To take the tour later, "
                 "select Help > UI Tour."),
              Utils::InfoBarEntry::GlobalSuppression::Enabled);
-    info.setCustomButtonInfo(tr("Take UI Tour"), [parent] {
+    info.addCustomButton(tr("Take UI Tour"), [parent] {
         Core::ICore::infoBar()->removeInfo(kTakeTourSetting);
         Core::ICore::infoBar()->globallySuppressInfo(kTakeTourSetting);
         auto intro = new IntroductionWidget(parent);