summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2018-11-28 15:50:13 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2018-11-30 15:56:21 +0000
commit47673cc99431bc92de866da6b22b84313b7092f2 (patch)
tree2cdcfc892e88374a0148d7bb3ca7d16a863b06b8
parent2e67996d5af5e2773bd64cf6d43b325b84b54131 (diff)
Compile-fix (g++ 8): move #include of mocs outside namespace
Change-Id: I9adaa11043c94e0c4d5530fbafa2ef2f15681cac Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--src/bluetooth/qbluetoothdevicediscoveryagent.cpp4
-rw-r--r--src/bluetooth/qbluetoothlocaldevice.cpp4
-rw-r--r--src/bluetooth/qbluetoothserver.cpp4
-rw-r--r--src/bluetooth/qbluetoothservicediscoveryagent.cpp4
-rw-r--r--src/bluetooth/qbluetoothsocket.cpp4
-rw-r--r--src/bluetooth/qbluetoothtransfermanager.cpp3
-rw-r--r--src/bluetooth/qbluetoothtransferreply.cpp4
7 files changed, 14 insertions, 13 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp
index e69dcce3..b132a3a6 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent.cpp
@@ -431,6 +431,6 @@ QString QBluetoothDeviceDiscoveryAgent::errorString() const
return d->errorString;
}
-#include "moc_qbluetoothdevicediscoveryagent.cpp"
-
QT_END_NAMESPACE
+
+#include "moc_qbluetoothdevicediscoveryagent.cpp"
diff --git a/src/bluetooth/qbluetoothlocaldevice.cpp b/src/bluetooth/qbluetoothlocaldevice.cpp
index 173650a0..38dd56f4 100644
--- a/src/bluetooth/qbluetoothlocaldevice.cpp
+++ b/src/bluetooth/qbluetoothlocaldevice.cpp
@@ -326,6 +326,6 @@ bool QBluetoothLocalDevice::isValid() const
the resulting local device selects the local default device.
*/
-#include "moc_qbluetoothlocaldevice.cpp"
-
QT_END_NAMESPACE
+
+#include "moc_qbluetoothlocaldevice.cpp"
diff --git a/src/bluetooth/qbluetoothserver.cpp b/src/bluetooth/qbluetoothserver.cpp
index 8f760eed..6991518f 100644
--- a/src/bluetooth/qbluetoothserver.cpp
+++ b/src/bluetooth/qbluetoothserver.cpp
@@ -323,6 +323,6 @@ QBluetoothServer::Error QBluetoothServer::error() const
return d->m_lastError;
}
-#include "moc_qbluetoothserver.cpp"
-
QT_END_NAMESPACE
+
+#include "moc_qbluetoothserver.cpp"
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.cpp b/src/bluetooth/qbluetoothservicediscoveryagent.cpp
index 390b9f74..a5fc7654 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent.cpp
@@ -575,6 +575,6 @@ bool QBluetoothServiceDiscoveryAgentPrivate::isDuplicatedService(
return false;
}
-#include "moc_qbluetoothservicediscoveryagent.cpp"
-
QT_END_NAMESPACE
+
+#include "moc_qbluetoothservicediscoveryagent.cpp"
diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp
index 16461bd3..25c115fa 100644
--- a/src/bluetooth/qbluetoothsocket.cpp
+++ b/src/bluetooth/qbluetoothsocket.cpp
@@ -840,6 +840,6 @@ QDebug operator<<(QDebug debug, QBluetoothSocket::SocketState state)
}
#endif
-#include "moc_qbluetoothsocket.cpp"
-
QT_END_NAMESPACE
+
+#include "moc_qbluetoothsocket.cpp"
diff --git a/src/bluetooth/qbluetoothtransfermanager.cpp b/src/bluetooth/qbluetoothtransfermanager.cpp
index 165faceb..37a3191a 100644
--- a/src/bluetooth/qbluetoothtransfermanager.cpp
+++ b/src/bluetooth/qbluetoothtransfermanager.cpp
@@ -130,6 +130,7 @@ QBluetoothTransferReply *QBluetoothTransferManager::put(const QBluetoothTransfer
return 0;
#endif
}
-#include "moc_qbluetoothtransfermanager.cpp"
QT_END_NAMESPACE
+
+#include "moc_qbluetoothtransfermanager.cpp"
diff --git a/src/bluetooth/qbluetoothtransferreply.cpp b/src/bluetooth/qbluetoothtransferreply.cpp
index 0faea96c..a5da8f8f 100644
--- a/src/bluetooth/qbluetoothtransferreply.cpp
+++ b/src/bluetooth/qbluetoothtransferreply.cpp
@@ -209,6 +209,6 @@ QBluetoothTransferReplyPrivate::QBluetoothTransferReplyPrivate()
{
}
-#include "moc_qbluetoothtransferreply.cpp"
-
QT_END_NAMESPACE
+
+#include "moc_qbluetoothtransferreply.cpp"