diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-06 21:55:48 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-06 21:55:48 (GMT) |
| commit | 360a51d64c607f5efae7a4f25a9a519424399b69 (patch) | |
| tree | 874eb46ab469865ce9d9b58b9d1cf86d49e5bd1c /src/qt3support/widgets | |
| parent | 7359baee83f6691c31a0a14ffd6f6cc147ed71fd (diff) | |
| parent | 2b91557c93354b766c78cbc4ab48bcd58207bf1a (diff) | |
| download | Qt-360a51d64c607f5efae7a4f25a9a519424399b69.zip Qt-360a51d64c607f5efae7a4f25a9a519424399b69.tar.gz Qt-360a51d64c607f5efae7a4f25a9a519424399b69.tar.bz2 | |
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'src/qt3support/widgets')
| -rw-r--r-- | src/qt3support/widgets/q3dockarea.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt3support/widgets/q3dockarea.cpp b/src/qt3support/widgets/q3dockarea.cpp index bb34622..fbe235e 100644 --- a/src/qt3support/widgets/q3dockarea.cpp +++ b/src/qt3support/widgets/q3dockarea.cpp @@ -1139,7 +1139,7 @@ void Q3DockArea::setAcceptDockWindow(Q3DockWindow *dw, bool accept) { if (accept) forbiddenWidgets.removeAll(dw); - else if (forbiddenWidgets.contains(dw)) + else if (!forbiddenWidgets.contains(dw)) forbiddenWidgets.append(dw); } |