diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:45:05 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:45:05 +0200 |
| commit | 4fda82b66e17cc03e6b08f1afd135069cfef09b7 (patch) | |
| tree | 303b85aaa1b04b3de819c0b77c509a7afa8540a7 /src/webchannel/doc/qtwebchannel.qdocconf | |
| parent | b025372d8b59b0080e1aa1d43b28da2c5544d30c (diff) | |
| parent | 39692e398ef847a1d6482419a617452cb1e5ae0d (diff) | |
| download | qtwebchannel-4fda82b66e17cc03e6b08f1afd135069cfef09b7.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1
Conflicts:
.qmake.conf
Change-Id: I52dc7e8ad7a9ce6fa36ad2d6ce5d8ea29b77b400
Diffstat (limited to 'src/webchannel/doc/qtwebchannel.qdocconf')
| -rw-r--r-- | src/webchannel/doc/qtwebchannel.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webchannel/doc/qtwebchannel.qdocconf b/src/webchannel/doc/qtwebchannel.qdocconf index fc036d2..cfb47e4 100644 --- a/src/webchannel/doc/qtwebchannel.qdocconf +++ b/src/webchannel/doc/qtwebchannel.qdocconf @@ -4,7 +4,7 @@ project = QtWebChannel description = Qt WebChannel Reference Documentation version = $QT_VERSION -examplesinstallpath = qtwebchannel/webchannel +examplesinstallpath = webchannel qhp.projects = QtWebChannel |