diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-04-11 09:34:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-11 09:34:23 +0200 |
| commit | 093290a662c17cdbedee7e820ec51c3e5ba82aef (patch) | |
| tree | 9523faf19abf5f3d411a16e7758367a05efe8a76 /src/widgets | |
| parent | c7cbf216999cd833cae667b8c6fbfa65d33e8efd (diff) | |
| parent | 95c8f24b71445956651a5d1eade9475dceb16675 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/ios/quiview.mm
Change-Id: I0fd0adeca1590fffddd577873172f6d987a60412
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/widgets/qmainwindowlayout.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/widgets/qsplitter.cpp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index 9b38da340c..9cf2e7de1f 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -68,6 +68,7 @@ #include <qstack.h> #include <qmap.h> #include <qtimer.h> +#include <qpointer.h> #ifndef QT_NO_DEBUG_STREAM # include <qdebug.h> @@ -1654,7 +1655,7 @@ void QMainWindowLayout::keepSize(QDockWidget *w) class QMainWindowTabBar : public QTabBar { QMainWindow *mainWindow; - QDockWidget *draggingDock; // Currently dragging (detached) dock widget + QPointer<QDockWidget> draggingDock; // Currently dragging (detached) dock widget public: QMainWindowTabBar(QMainWindow *parent); protected: @@ -1665,7 +1666,7 @@ protected: }; QMainWindowTabBar::QMainWindowTabBar(QMainWindow *parent) - : QTabBar(parent), mainWindow(parent), draggingDock(0) + : QTabBar(parent), mainWindow(parent) { setExpanding(false); } diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp index 5220cae5f2..aa05a44b8b 100644 --- a/src/widgets/widgets/qsplitter.cpp +++ b/src/widgets/widgets/qsplitter.cpp @@ -1198,8 +1198,8 @@ QWidget *QSplitter::replaceWidget(int index, QWidget *widget) /*! \fn int QSplitter::indexOf(QWidget *widget) const - Returns the index in the splitter's layout of the specified \a widget. This - also works for handles. + Returns the index in the splitter's layout of the specified \a widget, + or -1 if \a widget is not found. This also works for handles. Handles are numbered from 0. There are as many handles as there are child widgets, but the handle at position 0 is always hidden. |