diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:37:33 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:37:33 +0200 |
commit | 9e8daaed0466d760e047c5da58811e55e7807c0a (patch) | |
tree | eb75deaa8be7b1bbd777416aa1995990cd0f86a1 /src/serialport/doc | |
parent | 2ac9c0c0e6210f73884bbe2bcb3d8269519003a8 (diff) | |
parent | 9c9255eda50af191636ff9f18df35567c307dd8c (diff) | |
download | qtserialport-9e8daaed0466d760e047c5da58811e55e7807c0a.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I6a4c3e446633e6f142b87c268096b1bdc1598a62
Diffstat (limited to 'src/serialport/doc')
-rw-r--r-- | src/serialport/doc/qtserialport.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/serialport/doc/qtserialport.qdocconf b/src/serialport/doc/qtserialport.qdocconf index ac1fc1e..78c1b35 100644 --- a/src/serialport/doc/qtserialport.qdocconf +++ b/src/serialport/doc/qtserialport.qdocconf @@ -34,7 +34,7 @@ exampledirs += ../../../examples/serialport imagedirs += images excludedirs += ../qt4support -examplesinstallpath = qtserialport/serialport +examplesinstallpath = serialport depends += qtcore qtdoc qtnetwork qmake |