diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:52:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:52:27 +0200 |
| commit | 050caa7d53bd46a84978886d24675baf04a370ea (patch) | |
| tree | df5650bcdc8f8d9238cae4ca4a5eab7d3db63417 | |
| parent | 9751d3d82eecb4f2c2a805783fbcce9ccd189fea (diff) | |
| parent | 54eb58fb95c4cc33bc46cece8ab9bf4f5e5fb125 (diff) | |
| download | qtxmlpatterns-050caa7d53bd46a84978886d24675baf04a370ea.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I477b9d55e20afa1040c026c682e2647ecf50ea86
| -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 |
5 files changed, 1 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 \ ../ \ |