summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@qt.io>2016-08-30 15:43:32 +0200
committerAlex Blasche <alexander.blasche@qt.io>2016-08-31 05:44:52 +0000
commitfa54696446eaed03c2b84ca3e3c0c81ef5d42bea (patch)
treec610dba2f29e27f01b19752e96f2d85f8ccb1ba9
parent45bcf9e8f0249a984a90e021e69e93b96733ddd4 (diff)
Remove ambiguity when using QTimer::setInterval() pointer in examplev5.8.0-alpha1
This is required because QTimer introduced a new overload for setInterval(). Change-Id: I7dbf2eb9b424132439fc420b84584d2f55498c3c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--examples/serialbus/modbus/adueditor/modbustcpclient_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h b/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
index 50bcc04..0ec769a 100644
--- a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
+++ b/examples/serialbus/modbus/adueditor/modbustcpclient_p.h
@@ -85,7 +85,8 @@ public:
m_responseTimeoutDuration };
m_transactionStore.insert(m_tId, element);
- q->connect(q, &QModbusClient::timeoutChanged, element.timer.data(), &QTimer::setInterval);
+ q->connect(q, &QModbusClient::timeoutChanged,
+ element.timer.data(), QOverload<int>::of(&QTimer::setInterval));
QObject::connect(element.timer.data(), &QTimer::timeout, [this, writeToSocket]() {
if (!m_transactionStore.contains(m_tId))
return;