diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-03 08:49:38 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-08-03 08:49:38 -0500 |
| commit | 7d22e97622a6b963382b88aac6dfde06a2cd8f03 (patch) | |
| tree | 231f5c31f279d3e798702fe61e9b6bcef52b089b /src/widgets/qdockwindow.cpp | |
| parent | 6d0157ea558089bb957f35263424a405e42a6931 (diff) | |
| parent | fe7969ef886d7287fa959929ddd33fbad8407884 (diff) | |
| download | tqt-7d22e97622a6b963382b88aac6dfde06a2cd8f03.tar.gz tqt-7d22e97622a6b963382b88aac6dfde06a2cd8f03.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/widgets/qdockwindow.cpp')
| -rw-r--r-- | src/widgets/qdockwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp index 8e6996338..0f4a28e31 100644 --- a/src/widgets/qdockwindow.cpp +++ b/src/widgets/qdockwindow.cpp @@ -1620,8 +1620,8 @@ void TQDockWindow::setCloseMode( int m ) bool TQDockWindow::isCloseEnabled() const { - return ( ( cMode & Docked ) == Docked && place() == InDock || - ( cMode & Undocked ) == Undocked && place() == OutsideDock ); + return ( ( ( cMode & Docked ) == Docked && place() == InDock ) || + ( ( cMode & Undocked ) == Undocked && place() == OutsideDock ) ); } int TQDockWindow::closeMode() const |