From 0a8a7598223993c77985e99d46b20d7ea34fe8c2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 4 Dec 2017 18:32:32 +0100 Subject: fix namespaced build Change-Id: Ibd16658ef800afe1dec01311cc4ef1a9a6d83929 Reviewed-by: Timur Pocheptsov --- src/network/bearer/qbearerengine.cpp | 4 ++-- src/network/bearer/qnetworkconfigmanager.cpp | 4 ++-- src/network/bearer/qnetworksession.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/network/bearer') diff --git a/src/network/bearer/qbearerengine.cpp b/src/network/bearer/qbearerengine.cpp index 215cd3fddd..677da08cb6 100644 --- a/src/network/bearer/qbearerengine.cpp +++ b/src/network/bearer/qbearerengine.cpp @@ -93,8 +93,8 @@ bool QBearerEngine::configurationsInUse() const || hasUsedConfiguration(userChoiceConfigurations); } +QT_END_NAMESPACE + #include "moc_qbearerengine_p.cpp" #endif // QT_NO_BEARERMANAGEMENT - -QT_END_NAMESPACE diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp index 7d7b7cc5b0..81b5e01d6a 100644 --- a/src/network/bearer/qnetworkconfigmanager.cpp +++ b/src/network/bearer/qnetworkconfigmanager.cpp @@ -378,8 +378,8 @@ void QNetworkConfigurationManager::updateConfigurations() priv->performAsyncConfigurationUpdate(); } -#include "moc_qnetworkconfigmanager.cpp" - QT_END_NAMESPACE +#include "moc_qnetworkconfigmanager.cpp" + #endif // QT_NO_BEARERMANAGEMENT diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp index bbcd191041..e5562e3a0b 100644 --- a/src/network/bearer/qnetworksession.cpp +++ b/src/network/bearer/qnetworksession.cpp @@ -749,8 +749,8 @@ void QNetworkSession::disconnectNotify(const QMetaMethod &signal) d->setALREnabled(false); } -#include "moc_qnetworksession.cpp" - QT_END_NAMESPACE +#include "moc_qnetworksession.cpp" + #endif // QT_NO_BEARERMANAGEMENT -- cgit v1.2.3 From 23c55cd37ce1de489cf7c405a9d21781cbcb1ade Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Thu, 14 Dec 2017 05:55:29 +1000 Subject: bearermanagment: fix build for --no-feature-bearermanagement Change-Id: I9e3f44b924e09a8d1a5095dc55d585b3cab33c15 Reviewed-by: Thiago Macieira --- src/network/bearer/qbearerengine.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/network/bearer') diff --git a/src/network/bearer/qbearerengine.cpp b/src/network/bearer/qbearerengine.cpp index 215cd3fddd..9be49da8a2 100644 --- a/src/network/bearer/qbearerengine.cpp +++ b/src/network/bearer/qbearerengine.cpp @@ -95,6 +95,5 @@ bool QBearerEngine::configurationsInUse() const #include "moc_qbearerengine_p.cpp" -#endif // QT_NO_BEARERMANAGEMENT - QT_END_NAMESPACE +#endif // QT_NO_BEARERMANAGEMENT -- cgit v1.2.3