summaryrefslogtreecommitdiffstats
path: root/src/kernel/qdnd_x11.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-08-03 08:49:35 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-08-03 08:49:35 -0500
commit92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a (patch)
tree3de07468347367bdef8e6c0d765bdb209585a189 /src/kernel/qdnd_x11.cpp
parentda067173fd2ab6bca5943294a439c4992323227a (diff)
parentebcb1d80bf517aceb69778e1e9f67e5f4da8c484 (diff)
downloadqt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.tar.gz
qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/kernel/qdnd_x11.cpp')
-rw-r--r--src/kernel/qdnd_x11.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp
index 607a358..be72799 100644
--- a/src/kernel/qdnd_x11.cpp
+++ b/src/kernel/qdnd_x11.cpp
@@ -611,7 +611,7 @@ void qt_handle_xdnd_position( QWidget *w, const XEvent * xe, bool passive )
if (!passive && checkEmbedded(c, xe))
return;
- if ( !c || !c->acceptDrops() && c->isDesktop() ) {
+ if ( !c || ( !c->acceptDrops() && c->isDesktop() ) ) {
return;
}