summaryrefslogtreecommitdiffstats
path: root/src/network/kernel
diff options
context:
space:
mode:
authorMarkus Goetz <Markus.Goetz@nokia.com>2009-05-22 11:20:10 (GMT)
committerMarkus Goetz <Markus.Goetz@nokia.com>2009-05-22 12:40:07 (GMT)
commit8b2a16bd7f434a159e34e93dbffc983927a0a143 (patch)
tree366d7fe340ceaa512b292f25a23d4496ac903d8f /src/network/kernel
parenta0396c8c68aca446e68434e516bd46d749093b0f (diff)
downloadQt-8b2a16bd7f434a159e34e93dbffc983927a0a143.zip
Qt-8b2a16bd7f434a159e34e93dbffc983927a0a143.tar.gz
Qt-8b2a16bd7f434a159e34e93dbffc983927a0a143.tar.bz2
Fixed compilation with -qtnamespace
Task-number: 254333 Reviewed-by: Andy Shaw <qt-info@nokia.com>
Diffstat (limited to 'src/network/kernel')
-rw-r--r--src/network/kernel/qnetworkproxy.cpp4
-rw-r--r--src/network/kernel/qurlinfo.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index 62bdfc7..fd3a85a 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -1258,6 +1258,6 @@ QList<QNetworkProxy> QNetworkProxyFactory::proxyForQuery(const QNetworkProxyQuer
return globalNetworkProxy()->proxyForQuery(query);
}
-#endif // QT_NO_NETWORKPROXY
-
QT_END_NAMESPACE
+
+#endif // QT_NO_NETWORKPROXY
diff --git a/src/network/kernel/qurlinfo.cpp b/src/network/kernel/qurlinfo.cpp
index 255c9ea..d90c480 100644
--- a/src/network/kernel/qurlinfo.cpp
+++ b/src/network/kernel/qurlinfo.cpp
@@ -726,6 +726,6 @@ bool QUrlInfo::isValid() const
return d != 0;
}
-#endif // QT_NO_URLINFO
-
QT_END_NAMESPACE
+
+#endif // QT_NO_URLINFO