diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-12 03:01:35 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-12 03:01:35 +0200 |
| commit | c43c59275366a92d4a847c877e758b2813d20f71 (patch) | |
| tree | 0dd6cdcb28d1393e6624e234f7a3fceb2e099a21 /examples/serialbus | |
| parent | 1343e05db51e156ba315d2068c4ba2456443b3af (diff) | |
| parent | 3fc0d45a57181366cd4caf84c87c8467c5a326db (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I1ab92643c96792ee03cc3f77a6eaa1fd239890ae
Diffstat (limited to 'examples/serialbus')
| -rw-r--r-- | examples/serialbus/can/bitratebox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/serialbus/can/bitratebox.cpp b/examples/serialbus/can/bitratebox.cpp index fab2da5..7c19a5d 100644 --- a/examples/serialbus/can/bitratebox.cpp +++ b/examples/serialbus/can/bitratebox.cpp @@ -58,7 +58,7 @@ BitRateBox::BitRateBox(QWidget *parent) : { fillBitRates(); - connect(this, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), + connect(this, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &BitRateBox::checkCustomSpeedPolicy); } |