2 files changed, 32 insertions, 2 deletions
diff --git a/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp
index e7423d1..3a44b8b 100644
--- a/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp
+++ b/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp
@@ -52,7 +52,22 @@
 
 using namespace QPatternistSDK;
 
-Q_GLOBAL_STATIC(QNetworkAccessManager, networkAccessManager)
+static QNetworkAccessManager *s_networkAccessManager = 0;
+
+static void cleanupNetworkAccessManager()
+{
+    delete s_networkAccessManager;
+    s_networkAccessManager = 0;
+
+}
+static QNetworkAccessManager *networkAccessManager()
+{
+    if (!s_networkAccessManager) {
+        s_networkAccessManager = new QNetworkAccessManager;
+        qAddPostRoutine(cleanupNetworkAccessManager);
+    }
+    return s_networkAccessManager;
+}
 
 TestSuiteHandler::TestSuiteHandler(const QUrl &catalogFile,
                                    const bool useEList) : m_ts(0)
diff --git a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp
index 080ffac..c0d5a14 100644
--- a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp
+++ b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp
@@ -52,7 +52,22 @@
 
 using namespace QPatternistSDK;
 
-Q_GLOBAL_STATIC(QNetworkAccessManager, networkAccessManager)
+static QNetworkAccessManager *s_networkAccessManager = 0;
+
+static void cleanupNetworkAccessManager()
+{
+    delete s_networkAccessManager;
+    s_networkAccessManager = 0;
+
+}
+static QNetworkAccessManager *networkAccessManager()
+{
+    if (!s_networkAccessManager) {
+        s_networkAccessManager = new QNetworkAccessManager;
+        qAddPostRoutine(cleanupNetworkAccessManager);
+    }
+    return s_networkAccessManager;
+}
 
 XSLTTestSuiteHandler::XSLTTestSuiteHandler(const QUrl &catalogFile) : m_ts(0)
                                                                     , m_tc(0)