kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-07 20:34:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix composite text dialog not inserting variables under Qt 6 (#1348)

Browse Source 
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 <noreply@anthropic.com>
This commit is contained in:
ispyisail
2026-10-07 12:49:37 +13:00
parent 0708338bce
commit b9d459b0e6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/ui/compositetexteditdialog.cpp
+2 -2
View File
@@ -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());
}
sources/ui/compositetexteditdialog.h
+1 -1
View File
@@ -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;