diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-03-31 13:31:13 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-01 13:10:56 +0200 |
| commit | 0be470fd433e7514f3285ebdb1de776836048596 (patch) | |
| tree | d82777903180ec2fe3dc21ec5fca85a6bea125a2 | |
| parent | 6f1377dc67ad29296768e804842b386e08aca555 (diff) | |
| download | qtserialport-0be470fd433e7514f3285ebdb1de776836048596.tar.gz | |
Update dependencies and fix build errors
Change-Id: Ibe68313fe53b7d32d8bd23ad27b34ba4d501d7e7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | dependencies.yaml | 2 | ||||
| -rw-r--r-- | examples/serialport/blockingslave/dialog.cpp | 3 | ||||
| -rw-r--r-- | examples/serialport/slave/dialog.cpp | 6 | ||||
| -rw-r--r-- | examples/serialport/terminal/settingsdialog.cpp | 6 |
4 files changed, 7 insertions, 10 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index aa6c7e9..0477d9d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,4 +1,4 @@ dependencies: ../qtbase: - ref: 4cbadf699838406d14366ce61deec03cf45113f7 + ref: e0b89899e3c505edbdece60d6a2d2368a7ef9a01 required: true diff --git a/examples/serialport/blockingslave/dialog.cpp b/examples/serialport/blockingslave/dialog.cpp index b95f3e7..fa7ce97 100644 --- a/examples/serialport/blockingslave/dialog.cpp +++ b/examples/serialport/blockingslave/dialog.cpp @@ -97,8 +97,7 @@ Dialog::Dialog(QWidget *parent) : connect(&m_thread, &SlaveThread::error, this, &Dialog::processError); connect(&m_thread, &SlaveThread::timeout, this, &Dialog::processTimeout); - connect(m_serialPortComboBox, QOverload<const QString &>::of(&QComboBox::currentIndexChanged), - this, &Dialog::activateRunButton); + connect(m_serialPortComboBox, &QComboBox::currentIndexChanged, this, &Dialog::activateRunButton); connect(m_waitRequestSpinBox, &QSpinBox::textChanged, this, &Dialog::activateRunButton); connect(m_responseLineEdit, &QLineEdit::textChanged, this, &Dialog::activateRunButton); } diff --git a/examples/serialport/slave/dialog.cpp b/examples/serialport/slave/dialog.cpp index eec7999..31ab795 100644 --- a/examples/serialport/slave/dialog.cpp +++ b/examples/serialport/slave/dialog.cpp @@ -98,10 +98,8 @@ Dialog::Dialog(QWidget *parent) : connect(&m_serial, &QSerialPort::readyRead, this, &Dialog::readRequest); connect(&m_timer, &QTimer::timeout, this, &Dialog::processTimeout); - connect(m_serialPortComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), - this, &Dialog::activateRunButton); - connect(m_waitRequestSpinBox, QOverload<int>::of(&QSpinBox::valueChanged), - this, &Dialog::activateRunButton); + connect(m_serialPortComboBox, &QComboBox::currentIndexChanged, this, &Dialog::activateRunButton); + connect(m_waitRequestSpinBox, &QSpinBox::valueChanged, this, &Dialog::activateRunButton); connect(m_responseLineEdit, &QLineEdit::textChanged, this, &Dialog::activateRunButton); } diff --git a/examples/serialport/terminal/settingsdialog.cpp b/examples/serialport/terminal/settingsdialog.cpp index 4b16bf5..ad06004 100644 --- a/examples/serialport/terminal/settingsdialog.cpp +++ b/examples/serialport/terminal/settingsdialog.cpp @@ -69,11 +69,11 @@ SettingsDialog::SettingsDialog(QWidget *parent) : connect(m_ui->applyButton, &QPushButton::clicked, this, &SettingsDialog::apply); - connect(m_ui->serialPortInfoListBox, QOverload<int>::of(&QComboBox::currentIndexChanged), + connect(m_ui->serialPortInfoListBox, &QComboBox::currentIndexChanged, this, &SettingsDialog::showPortInfo); - connect(m_ui->baudRateBox, QOverload<int>::of(&QComboBox::currentIndexChanged), + connect(m_ui->baudRateBox, &QComboBox::currentIndexChanged, this, &SettingsDialog::checkCustomBaudRatePolicy); - connect(m_ui->serialPortInfoListBox, QOverload<int>::of(&QComboBox::currentIndexChanged), + connect(m_ui->serialPortInfoListBox, &QComboBox::currentIndexChanged, this, &SettingsDialog::checkCustomDevicePathPolicy); fillPortsParameters(); |