From fb1dc19bf195c530b7f44d18cc927472b9866a46 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Fri, 8 Apr 2016 09:10:17 +0200 Subject: tst_XmlPatterns::xquerySupport - silence logging category On 10.11 SSL code started producing error messages recently (under investigation) making a test, that expects no error messages to fail. It's a quick and dirty fix. Change-Id: I2339aad551633b378727329d326e610e669b3b2f Reviewed-by: Akseli Salovaara Reviewed-by: Timur Pocheptsov --- tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index 61fa555..223f713 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -148,6 +148,12 @@ void tst_XmlPatterns::xquerySupport() if(!cwd.isEmpty()) process.setWorkingDirectory(inputFile(cwd)); +#ifdef Q_OS_OSX + QProcessEnvironment env(process.processEnvironment()); + env.insert("QT_LOGGING_RULES", "qt.network.ssl=false"); + process.setProcessEnvironment(env); +#endif + process.start(m_command, arguments); QVERIFY2(process.waitForStarted(), msgProcessError("Failed to start", process).constData()); -- cgit v1.2.1 From 9751d3d82eecb4f2c2a805783fbcce9ccd189fea Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Wed, 4 May 2016 08:32:53 +0200 Subject: tst_XmlPattern:xquerySupport - silence QSsl's debug output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit None of tests expects our own debug output in the processe's output, thus if we have something (even a minor warning) - the test can fail. It was first found on OS X 10.11 with Secure Transport backend, now pops up with OpenSSL back-end also (Windows 7) Change-Id: I19108416048bf89feae2648106b4a4ba8604aa93 Reviewed-by: Jani Heikkinen Reviewed-by: Tony Sarajärvi --- tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index 223f713..e182565 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -148,11 +148,9 @@ void tst_XmlPatterns::xquerySupport() if(!cwd.isEmpty()) process.setWorkingDirectory(inputFile(cwd)); -#ifdef Q_OS_OSX QProcessEnvironment env(process.processEnvironment()); env.insert("QT_LOGGING_RULES", "qt.network.ssl=false"); process.setProcessEnvironment(env); -#endif process.start(m_command, arguments); QVERIFY2(process.waitForStarted(), msgProcessError("Failed to start", process).constData()); -- cgit v1.2.1 From fcb22201726669f52f98528d9a15f8cdbb126b48 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 21 Apr 2016 19:21:13 +0200 Subject: delete .desktop files of examples they were added without an explanation, and they can't be particularly useful (because they contain hard-coded paths and refer to non-existing icons). Change-Id: I24cb431268c2d5130bf70a5e2777d321eda36e97 Reviewed-by: Joerg Bornemann --- examples/xmlpatterns/filetree/filetree.desktop | 11 ----------- examples/xmlpatterns/recipes/recipes.desktop | 11 ----------- examples/xmlpatterns/schema/schema.desktop | 11 ----------- .../xquery/globalVariables/globalVariables.desktop | 11 ----------- 4 files changed, 44 deletions(-) delete mode 100644 examples/xmlpatterns/filetree/filetree.desktop delete mode 100644 examples/xmlpatterns/recipes/recipes.desktop delete mode 100644 examples/xmlpatterns/schema/schema.desktop delete mode 100644 examples/xmlpatterns/xquery/globalVariables/globalVariables.desktop diff --git a/examples/xmlpatterns/filetree/filetree.desktop b/examples/xmlpatterns/filetree/filetree.desktop deleted file mode 100644 index b11e0de..0000000 --- a/examples/xmlpatterns/filetree/filetree.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=File System -Exec=/opt/usr/bin/filetree -Icon=filetree -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/xmlpatterns/recipes/recipes.desktop b/examples/xmlpatterns/recipes/recipes.desktop deleted file mode 100644 index db90972..0000000 --- a/examples/xmlpatterns/recipes/recipes.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=Recipes -Exec=/opt/usr/bin/recipes -Icon=recipes -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/xmlpatterns/schema/schema.desktop b/examples/xmlpatterns/schema/schema.desktop deleted file mode 100644 index 06d98e0..0000000 --- a/examples/xmlpatterns/schema/schema.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=XML Schema Validation -Exec=/opt/usr/bin/schema -Icon=schema -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable diff --git a/examples/xmlpatterns/xquery/globalVariables/globalVariables.desktop b/examples/xmlpatterns/xquery/globalVariables/globalVariables.desktop deleted file mode 100644 index d2f5055..0000000 --- a/examples/xmlpatterns/xquery/globalVariables/globalVariables.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Terminal=false -Name=C++ Source Code Analyzer -Exec=/opt/usr/bin/globalVariables -Icon=globalVariables -X-Window-Icon= -X-HildonDesk-ShowInToolbar=true -X-Osso-Type=application/x-executable -- cgit v1.2.1 From 23b764d34705d0f858e428e02c910637368b2694 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 10 May 2016 14:54:33 +0200 Subject: Doc: Remove repository name from examplesinstallpath Examples in binary packages now directly match the install path. Change-Id: Ie5faec6f18ffb65affa1b277bb3f6b3f5c66fb44 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko --- src/xmlpatterns/doc/qtxmlpatterns.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf index 7ffaca1..d7919dc 100644 --- a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf +++ b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf @@ -4,7 +4,7 @@ project = QtXmlPatterns description = Qt XML Patterns Reference Documentation version = $QT_VERSION -examplesinstallpath = qtxmlpatterns/xmlpatterns +examplesinstallpath = xmlpatterns exampledirs += ../../../examples/xmlpatterns \ ../ \ -- cgit v1.2.1 From 54eb58fb95c4cc33bc46cece8ab9bf4f5e5fb125 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 19 May 2016 13:27:43 +0200 Subject: Bump version Change-Id: Ieb8d21fdcae2b87cd5669ab5a1441bcf1bc4d946 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 5c42719..9665d29 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += qt_example_installs CONFIG += warning_clean -MODULE_VERSION = 5.6.1 +MODULE_VERSION = 5.6.2 -- cgit v1.2.1