[Tizen-submit] 21634: Changes to Tizen:Generic/qt5-qtxmlpatterns

noreply at tizen.org noreply at tizen.org
Wed Feb 26 11:08:56 GMT 2014


Hi,
Tomasz Olszak have made the following changes to qt5-qtxmlpatterns in project Tizen:Generic. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #21634

  submit:       Tizen:Generic:build/qt5-qtxmlpatterns(cleanup) -> Tizen:Generic


Message:
Submitter: Tomasz Olszak <olszak.tomasz at gmail.com>
Comments: Update from upstream: Bug-Tizen:TIVI-2416
Git project: platform/upstream/qtxmlpatterns
Tag: submit/tizen/20140226.110239
Commit: 764e408d57818b7a30c1dad5381d37c089c239c5 Bump package version to 5.2.2

State:   new        2014-02-26T11:05:17 tizenrobot
Comment: <no comment>
spec files:
-----------
--- qt5-qtxmlpatterns.spec
+++ qt5-qtxmlpatterns.spec
@@ -24,7 +24,7 @@
 # http://merproject.org
 
 Name:       qt5-qtxmlpatterns
-VCS:        platform/upstream/qtxmlpatterns#a8732850946abb587574f4d2bc75271dbedece70
+VCS:        platform/upstream/qtxmlpatterns#764e408d57818b7a30c1dad5381d37c089c239c5
 Summary:    Qt XML Patterns library
 Version:    5.2.2
 Release:    0

other changes:
--------------

++++++ qt5-qtxmlpatterns-5.2.2.tar.bz2
--- qt5-qtxmlpatterns-5.2.2/qtxmlpatterns/.tag
+++ qt5-qtxmlpatterns-5.2.2/qtxmlpatterns/.tag
@@ -1 +1 @@
-ecf06489d90385cf2ca67dc5f70529f76421beae
+eaf0a92dcb6fb12f3d65aa4fc806ccbfaa7f7db0
--- qt5-qtxmlpatterns-5.2.2/qtxmlpatterns/tests/auto/qxmlquery/tst_qxmlquery.cpp
+++ qt5-qtxmlpatterns-5.2.2/qtxmlpatterns/tests/auto/qxmlquery/tst_qxmlquery.cpp
@@ -256,7 +256,6 @@
 void tst_QXmlQuery::initTestCase()
 {
     QVERIFY2(!m_xmlPatternsDir.isEmpty(), qPrintable(QString::fromLatin1("Cannot locate '../xmlpatterns' starting from %1").arg(QDir::currentPath())));
-    QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
 }
 
 void tst_QXmlQuery::checkBaseURI(const QUrl &baseURI, const QString &candidate)
@@ -1994,6 +1993,10 @@
 
 void tst_QXmlQuery::fnDocNetworkAccessSuccess() const
 {
+    if (QTest::currentDataTag() == QByteArray("http scheme")
+            || QTest::currentDataTag() == QByteArray("ftp scheme"))
+        QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
+
 #if defined(Q_OS_WINCE) && !defined(_X86_)
     QStringList testsToSkip;
     testsToSkip << "http scheme" << "ftp scheme";
@@ -2065,6 +2068,11 @@
 
 void tst_QXmlQuery::fnDocNetworkAccessFailure() const
 {
+    if (QTest::currentDataTag() == QByteArray("http scheme, not well-formed")
+            || QTest::currentDataTag() == QByteArray("https scheme, not well-formed")
+            || QTest::currentDataTag() == QByteArray("ftp scheme, not well-formed"))
+        QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
+
     QFETCH(QUrl, uriToOpen);
 
     QVERIFY(uriToOpen.isValid());
@@ -2525,6 +2533,10 @@
 
 void tst_QXmlQuery::setQueryQUrlSuccess() const
 {
+    if (QTest::currentDataTag() == QByteArray("A valid query via the ftp scheme")
+            || QTest::currentDataTag() == QByteArray("A valid query via the http scheme"))
+        QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
+
 #if defined(Q_OS_WINCE) && !defined(_X86_)
     QStringList testsToSkip;
     testsToSkip << "A valid query via the ftp scheme" << "A valid query via the http scheme";
@@ -2595,6 +2607,10 @@
 
 void tst_QXmlQuery::setQueryQUrlFailure() const
 {
+    if (QTest::currentDataTag() == QByteArray("A query via http:// that is completely empty, but readable.")
+            || QTest::currentDataTag() == QByteArray("A query via ftp:// that is completely empty, but readable."))
+        QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
+
     QFETCH(QUrl, queryURI);
 
     MessageSilencer silencer;
--- qt5-qtxmlpatterns-5.2.2/qtxmlpatterns/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
+++ qt5-qtxmlpatterns-5.2.2/qtxmlpatterns/tests/auto/xmlpatterns/tst_xmlpatterns.cpp
@@ -104,8 +104,6 @@
 
 void tst_XmlPatterns::initTestCase()
 {
-    QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
-

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list