diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-20 12:19:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-20 12:19:01 +0200 |
| commit | 9070b9c9481c7c0b40dbe251e888d7af1e1722ce (patch) | |
| tree | 572142fe285fad5b00b8509285c6af2748cff5df | |
| parent | 81152f31125d5f903712b07ed51874caa4086318 (diff) | |
| parent | d1ed290dca79e546986807b492a9aa4b0b1cc55a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I4abf96ab888c259c53c4451df2636ff096c64975
| -rw-r--r-- | src/serialbus/doc/qtserialbus.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/serialbus/doc/qtserialbus.qdocconf b/src/serialbus/doc/qtserialbus.qdocconf index e78b63e..c84064c 100644 --- a/src/serialbus/doc/qtserialbus.qdocconf +++ b/src/serialbus/doc/qtserialbus.qdocconf @@ -4,7 +4,7 @@ project = QtSerialBus description = Qt Serial Bus Reference Documentation version = $QT_VERSION -examplesinstallpath = qtserialbus/serialbus +examplesinstallpath = serialbus qhp.projects = QtSerialBus |