diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-19 06:30:59 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 06:31:06 +0200 |
commit | 640441882d20f86db05ab5fd1141abe39a0bd409 (patch) | |
tree | 9d0e701de155d32d3614a60b4d6eea5f324211f4 /src/widgets | |
parent | d16692ed1b12b2d464afcb32799580402e82e393 (diff) | |
parent | eba979f6956f8d74bf5a3cb6ed0d585396b790f1 (diff) |
Merge remote-tracking branch 'origin/5.6.1' into 5.6
Conflicts:
src/network/socket/qnativesocketengine_winrt.cpp
Change-Id: I8edb72f8ba958d80c3d7993b3feaaae782ca8d9c
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/doc/qtwidgets.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/doc/qtwidgets.qdocconf b/src/widgets/doc/qtwidgets.qdocconf index 8160396ca2..f307e9d3e4 100644 --- a/src/widgets/doc/qtwidgets.qdocconf +++ b/src/widgets/doc/qtwidgets.qdocconf @@ -4,7 +4,7 @@ project = QtWidgets description = Qt Widgets Reference Documentation version = $QT_VERSION -examplesinstallpath = qtbase/widgets +examplesinstallpath = widgets qhp.projects = QtWidgets |