diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:39:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:39:25 +0200 |
| commit | 87cfa3b24f12ae4cd1ddbb5450b307b95334feb1 (patch) | |
| tree | db3b411aff6742d3d884303f886eddaab18d87c0 | |
| parent | 1ae512c3fef489f2c9e76c15a060cb58754758a1 (diff) | |
| parent | 043abc9c8aace5225cbc2ca152246a20070d8657 (diff) | |
| download | qttools-87cfa3b24f12ae4cd1ddbb5450b307b95334feb1.tar.gz | |
Merge remote-tracking branch 'origin/5.6.1' into 5.6
Change-Id: Ie9b5988af8eb502de001a1ace83996a8e9659a18
| -rw-r--r-- | src/assistant/assistant/doc/qtassistant.qdocconf | 2 | ||||
| -rw-r--r-- | src/assistant/help/doc/qthelp.qdocconf | 2 | ||||
| -rw-r--r-- | src/designer/src/designer/doc/qtdesigner.qdocconf | 2 | ||||
| -rw-r--r-- | src/designer/src/uitools/doc/qtuitools.qdocconf | 2 | ||||
| -rw-r--r-- | src/linguist/linguist/doc/qtlinguist.qdocconf | 2 | ||||
| -rw-r--r-- | src/qdoc/doc/files/qtgui.qdocconf | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/assistant/assistant/doc/qtassistant.qdocconf b/src/assistant/assistant/doc/qtassistant.qdocconf index 01d4bf0c5..e5dcaa8ec 100644 --- a/src/assistant/assistant/doc/qtassistant.qdocconf +++ b/src/assistant/assistant/doc/qtassistant.qdocconf @@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtAssistant description = Qt Assistant Manual -examplesinstallpath = qttools/assistant +examplesinstallpath = assistant qhp.projects = QtAssistant diff --git a/src/assistant/help/doc/qthelp.qdocconf b/src/assistant/help/doc/qthelp.qdocconf index 90373996b..0b4223e93 100644 --- a/src/assistant/help/doc/qthelp.qdocconf +++ b/src/assistant/help/doc/qthelp.qdocconf @@ -4,7 +4,7 @@ project = QtHelp description = Qt Help Reference Documentation version = $QT_VERSION -examplesinstallpath = qttools/help +examplesinstallpath = help qhp.projects = QtHelp diff --git a/src/designer/src/designer/doc/qtdesigner.qdocconf b/src/designer/src/designer/doc/qtdesigner.qdocconf index ed897f76b..cc0d881aa 100644 --- a/src/designer/src/designer/doc/qtdesigner.qdocconf +++ b/src/designer/src/designer/doc/qtdesigner.qdocconf @@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtDesigner description = Qt Designer Manual -examplesinstallpath = qttools/designer +examplesinstallpath = designer qhp.projects = QtDesigner diff --git a/src/designer/src/uitools/doc/qtuitools.qdocconf b/src/designer/src/uitools/doc/qtuitools.qdocconf index f5abc19d1..b3306ce59 100644 --- a/src/designer/src/uitools/doc/qtuitools.qdocconf +++ b/src/designer/src/uitools/doc/qtuitools.qdocconf @@ -4,7 +4,7 @@ project = QtUiTools description = Qt UI Tools Reference Documentation version = $QT_VERSION -examplesinstallpath = qttools/uitools +examplesinstallpath = uitools qhp.projects = QtUiTools diff --git a/src/linguist/linguist/doc/qtlinguist.qdocconf b/src/linguist/linguist/doc/qtlinguist.qdocconf index b5a347916..db0558233 100644 --- a/src/linguist/linguist/doc/qtlinguist.qdocconf +++ b/src/linguist/linguist/doc/qtlinguist.qdocconf @@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtLinguist description = Qt Linguist Manual -examplesinstallpath = qttools/linguist +examplesinstallpath = linguist qhp.projects = QtLinguist diff --git a/src/qdoc/doc/files/qtgui.qdocconf b/src/qdoc/doc/files/qtgui.qdocconf index 0b2d28108..855ed538c 100644 --- a/src/qdoc/doc/files/qtgui.qdocconf +++ b/src/qdoc/doc/files/qtgui.qdocconf @@ -4,7 +4,7 @@ project = QtGui description = Qt GUI Reference Documentation version = $QT_VERSION -examplesinstallpath = qtbase/gui +examplesinstallpath = gui qhp.projects = QtGui |