summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2010-12-09 10:21:12 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-12-10 11:05:24 (GMT)
commit7ea96f0d7b720eb38f3a974aa6cce2738f6ed808 (patch)
treecdc1ada39c0825867cc89acdc20ce3e85e6c9390
parent0aaa9b79d9fb5c7ae4f293a272beab43e5851c83 (diff)
downloadQt-7ea96f0d7b720eb38f3a974aa6cce2738f6ed808.zip
Qt-7ea96f0d7b720eb38f3a974aa6cce2738f6ed808.tar.gz
Qt-7ea96f0d7b720eb38f3a974aa6cce2738f6ed808.tar.bz2
Fix compilation of qnetworkreply test with namespaces.
(cherry picked from commit e195adf461ae81f1fedd75cc8907f823edd1f8f7)
-rw-r--r--tests/auto/qnetworkreply/tst_qnetworkreply.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index ebdc3e2..c796272 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -345,10 +345,10 @@ private Q_SLOTS:
void parentingRepliesToTheApp();
};
-QT_BEGIN_NAMESPACE
-
bool tst_QNetworkReply::seedCreated = false;
+QT_BEGIN_NAMESPACE
+
namespace QTest {
template<>
char *toString(const QNetworkReply::NetworkError& code)