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 /src | |
| 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/xmlpatterns/doc/qtxmlpatterns.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
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 \ ../ \ |