From b9d459b0e6935e412f8c69a80fc392235098af25 Mon Sep 17 00:00:00 2001 From: ispyisail Date: Wed, 7 Oct 2026 12:49:37 +1300 Subject: [PATCH] Fix composite text dialog not inserting variables under Qt 6 (#1348) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The slot was auto-connected by name to QComboBox::activated(QString), which Qt 6 removed, so connectSlotsByName() found no signal and picking a variable in the "Texte composé" dialog did nothing. activated(int) exists in Qt 5 and Qt 6; the slot never used its argument and reads currentData() as before. Same fix as the CompositeTextEditDialog half of #674, which was closed unmerged. Co-Authored-By: Claude Opus 5.5 --- sources/ui/compositetexteditdialog.cpp | 4 ++-- sources/ui/compositetexteditdialog.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sources/ui/compositetexteditdialog.cpp b/sources/ui/compositetexteditdialog.cpp index ac4e9c89b..ab98e55cd 100644 --- a/sources/ui/compositetexteditdialog.cpp +++ b/sources/ui/compositetexteditdialog.cpp @@ -78,9 +78,9 @@ void CompositeTextEditDialog::setUpComboBox(bool is_report) } } -void CompositeTextEditDialog::on_m_info_cb_activated(const QString &arg1) +void CompositeTextEditDialog::on_m_info_cb_activated(int index) { - Q_UNUSED(arg1) + Q_UNUSED(index) ui->m_plain_text_edit->insertPlainText(ui->m_info_cb->currentData().toString()); } diff --git a/sources/ui/compositetexteditdialog.h b/sources/ui/compositetexteditdialog.h index 31d0e0d65..a3de0e3f8 100644 --- a/sources/ui/compositetexteditdialog.h +++ b/sources/ui/compositetexteditdialog.h @@ -28,7 +28,7 @@ class CompositeTextEditDialog : public QDialog QString plainText() const; private slots: - void on_m_info_cb_activated(const QString &arg1); + void on_m_info_cb_activated(int index); protected: void focusInEvent(QFocusEvent *event) override;