diff options
author | Darrell Anderson <[email protected]> | 2012-08-03 08:49:35 -0500 |
---|---|---|
committer | Darrell Anderson <[email protected]> | 2012-08-03 08:49:35 -0500 |
commit | 92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a (patch) | |
tree | 3de07468347367bdef8e6c0d765bdb209585a189 /src/widgets/qdockarea.cpp | |
parent | da067173fd2ab6bca5943294a439c4992323227a (diff) | |
parent | ebcb1d80bf517aceb69778e1e9f67e5f4da8c484 (diff) | |
download | qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.tar.gz qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/widgets/qdockarea.cpp')
-rw-r--r-- | src/widgets/qdockarea.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/qdockarea.cpp b/src/widgets/qdockarea.cpp index 2d4d957..663c3d9 100644 --- a/src/widgets/qdockarea.cpp +++ b/src/widgets/qdockarea.cpp @@ -691,7 +691,7 @@ void QDockArea::moveDockWindow( QDockWindow *w, const QPoint &p, const QRect &r, QRect lr = *lines.at( lineOf( dockWindowIndex ) ); if ( dockWindowIndex != -1 ) { if ( lineStarts.find( w ) != -1 && - ( dockWindowIndex < (int)dockWindows->count() - 1 && lineStarts.find( dockWindows->at( dockWindowIndex + 1 ) ) != -1 || + ( ( dockWindowIndex < (int)dockWindows->count() - 1 && lineStarts.find( dockWindows->at( dockWindowIndex + 1 ) ) != -1 ) || dockWindowIndex == (int)dockWindows->count() - 1 ) ) wasAloneInLine = TRUE; dockWindow = dockWindows->take( dockWindowIndex ); |