diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-04-05 21:26:33 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-04-05 21:27:00 +0200 |
commit | b4468be74961d59f593cd07a575effc6e8fb1bfc (patch) | |
tree | 902317380e3f1b175d8b3e8e2f9ba26e75fa9751 | |
parent | d8608214913963aa209978d9fbbc5d3c041dcff2 (diff) | |
parent | 0e1bb27c446f5c5f6bbb3c06fd0d188d10de1d7c (diff) | |
download | qtxmlpatterns-b4468be74961d59f593cd07a575effc6e8fb1bfc.tar.gz |
Merge branch 'stable' into dev
Change-Id: I06fd788ffd32b612d7cc99ab65b2ae4deffcd508
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | dist/changes-5.0.2 | 25 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestSuiteHandler.cpp | 19 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp | 19 |
4 files changed, 60 insertions, 5 deletions
diff --git a/.qmake.conf b/.qmake.conf index 02554ab..6aa780c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.0.2 +MODULE_VERSION = 5.1.0 diff --git a/dist/changes-5.0.2 b/dist/changes-5.0.2 new file mode 100644 index 0000000..f29fa49 --- /dev/null +++ b/dist/changes-5.0.2 @@ -0,0 +1,25 @@ +Qt 5.0.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.0.0 and 5.0.1. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://qt-project.org/doc/qt-5.0/ + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt-project.org/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + +**************************************************************************** +* General * +**************************************************************************** + +General Improvements +-------------------- + + - This release contains only minor code improvements. diff --git a/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp index 3f92297..3a44b8b 100644 --- a/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp +++ b/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp @@ -52,7 +52,22 @@ using namespace QPatternistSDK; -QNetworkAccessManager s_networkManager; +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) @@ -275,7 +290,7 @@ bool TestSuiteHandler::endElement(const QString &namespaceURI, } else if(localName == QLatin1String("sources")) { - const QPatternist::NetworkAccessDelegator::Ptr networkDelegator(new QPatternist::NetworkAccessDelegator(&s_networkManager, &s_networkManager)); + const QPatternist::NetworkAccessDelegator::Ptr networkDelegator(new QPatternist::NetworkAccessDelegator(networkAccessManager(), networkAccessManager())); m_resourceLoader = QPatternist::ResourceLoader::Ptr(new QPatternist::AccelTreeResourceLoader(Global::namePool(), networkDelegator)); diff --git a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp index b487482..c0d5a14 100644 --- a/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp +++ b/tests/auto/xmlpatternssdk/XSLTTestSuiteHandler.cpp @@ -52,7 +52,22 @@ using namespace QPatternistSDK; -extern QNetworkAccessManager s_networkManager; +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) @@ -60,7 +75,7 @@ XSLTTestSuiteHandler::XSLTTestSuiteHandler(const QUrl &catalogFile) : m_ts(0) , m_catalogFile(catalogFile) , m_removeTestcase(false) { - const QPatternist::NetworkAccessDelegator::Ptr networkDelegator(new QPatternist::NetworkAccessDelegator(&s_networkManager, &s_networkManager)); + const QPatternist::NetworkAccessDelegator::Ptr networkDelegator(new QPatternist::NetworkAccessDelegator(networkAccessManager(), networkAccessManager())); m_resourceLoader = QPatternist::ResourceLoader::Ptr(new QPatternist::AccelTreeResourceLoader(Global::namePool(), networkDelegator)); |