diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2018-11-28 15:50:14 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-11-30 15:56:35 +0000 |
commit | 35df56b87a1201dcb75540af5d828960517e8570 (patch) | |
tree | aadb6651582705a01df00054a55952052a844a69 | |
parent | 41621c26f1b399b7d8edee7ac496e82de4d9de72 (diff) |
Compile-fix (g++ 8): move #include of mocs outside namespace
Change-Id: I392926b7352fc8a72231a8fee34839c99d76ccbe
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r-- | src/serialbus/qmodbusreply.cpp | 4 | ||||
-rw-r--r-- | src/serialbus/qmodbusrtuserialslave.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/serialbus/qmodbusreply.cpp b/src/serialbus/qmodbusreply.cpp index 297724b..c8b328f 100644 --- a/src/serialbus/qmodbusreply.cpp +++ b/src/serialbus/qmodbusreply.cpp @@ -269,6 +269,6 @@ void QModbusReply::setRawResult(const QModbusResponse &response) d->m_response = response; } -#include "moc_qmodbusreply.cpp" - QT_END_NAMESPACE + +#include "moc_qmodbusreply.cpp" diff --git a/src/serialbus/qmodbusrtuserialslave.cpp b/src/serialbus/qmodbusrtuserialslave.cpp index 899bd8d..36a845c 100644 --- a/src/serialbus/qmodbusrtuserialslave.cpp +++ b/src/serialbus/qmodbusrtuserialslave.cpp @@ -158,6 +158,6 @@ QModbusResponse QModbusRtuSerialSlave::processRequest(const QModbusPdu &request) return QModbusServer::processRequest(request); } -#include "moc_qmodbusrtuserialslave.cpp" - QT_END_NAMESPACE + +#include "moc_qmodbusrtuserialslave.cpp" |