diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-08 17:15:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-08 17:15:55 +0200 |
| commit | 3e71810cf3153e4331fc075a73b6408adcf33654 (patch) | |
| tree | 9f5fbb7a5dc2a902b380dd69a222c0f2cd6eb760 /src/widgets/widgets/qdockwidget.cpp | |
| parent | 6feec9da93032d11a768802ac2187d9d4153b1ec (diff) | |
| parent | ebd1046323615f22192055a94438bf85fc360ca3 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/network/access/qhttpnetworkconnection.cpp
src/network/access/qhttpnetworkconnection_p.h
Change-Id: I11f8641ef482efa8cee1b79977d19cc3182814b4
Diffstat (limited to 'src/widgets/widgets/qdockwidget.cpp')
| -rw-r--r-- | src/widgets/widgets/qdockwidget.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index d664727d89..aec798e2e4 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -1317,7 +1317,9 @@ QDockWidget::DockWidgetFeatures QDockWidget::features() const By default, this property is \c true. - \sa isWindow() + When this property changes, the \c {topLevelChanged()} signal is emitted. + + \sa isWindow(), topLevelChanged() */ void QDockWidget::setFloating(bool floating) { |