diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-24 11:03:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-24 11:04:11 +0200 |
| commit | 560597a219888d71314d8085cd1077709478d281 (patch) | |
| tree | 3bdd4ee68938995d8cbbfa7eb9981a5ab4cd1780 | |
| parent | 280af371c3cb025378a1dec41a6d462164c4b497 (diff) | |
| parent | 050caa7d53bd46a84978886d24675baf04a370ea (diff) | |
| download | qtxmlpatterns-560597a219888d71314d8085cd1077709478d281.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ie2fcdbd40c4ee41d74250fed025f0363931aefa9
| -rw-r--r-- | examples/xmlpatterns/filetree/filetree.desktop | 11 | ||||
| -rw-r--r-- | examples/xmlpatterns/recipes/recipes.desktop | 11 | ||||
| -rw-r--r-- | examples/xmlpatterns/schema/schema.desktop | 11 | ||||
| -rw-r--r-- | examples/xmlpatterns/xquery/globalVariables/globalVariables.desktop | 11 | ||||
| -rw-r--r-- | src/xmlpatterns/doc/qtxmlpatterns.qdocconf | 2 | ||||
| -rw-r--r-- | tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 4 |
6 files changed, 5 insertions, 45 deletions
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 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 \ ../ \ diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index 1711666..71150e1 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -144,6 +144,10 @@ void tst_XmlPatterns::xquerySupport() if(!cwd.isEmpty()) process.setWorkingDirectory(inputFile(cwd)); + QProcessEnvironment env(process.processEnvironment()); + env.insert("QT_LOGGING_RULES", "qt.network.ssl=false"); + process.setProcessEnvironment(env); + process.start(m_command, arguments); QVERIFY2(process.waitForStarted(), msgProcessError("Failed to start", process).constData()); |