diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-06-02 23:20:47 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@nokia.com> | 2011-06-07 15:50:53 +0200 |
commit | 30b7c6512cde501e0e5da6e2a6dd2d8113092269 (patch) | |
tree | 057a44051a0c34a6b2e72c4a2a006d0609a9d31e /src/plugins/platforms/xcb/qxcbintegration.cpp | |
parent | 92edbd20603dfe2c6b68e0023b76aa9bbab89688 (diff) |
X11 DnD implementation
Initial code for DnD on X11. Only Xdnd based,
Motif DnD is being ignored.
The code is currently limited to dropping
stuff onto the application. Starting drags
is not yet implemented.
Reviewed-by: Samuel
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbintegration.cpp')
-rw-r--r-- | src/plugins/platforms/xcb/qxcbintegration.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index c63a29b675..a7d88e7741 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -46,7 +46,7 @@ #include "qxcbwindowsurface.h" #include "qxcbnativeinterface.h" #include "qxcbclipboard.h" -#include <qsimpledrag.h> +#include "qxcbdrag.h" #include <qgenericunixprintersupport.h> @@ -70,13 +70,11 @@ QXcbIntegration::QXcbIntegration() m_fontDatabase = new QGenericUnixFontDatabase(); m_nativeInterface = new QXcbNativeInterface; - m_drag = new QSimpleDrag; } QXcbIntegration::~QXcbIntegration() { delete m_connection; - delete m_drag; } bool QXcbIntegration::hasCapability(QPlatformIntegration::Capability cap) const @@ -371,5 +369,5 @@ QPlatformClipboard *QXcbIntegration::clipboard() const QPlatformDrag *QXcbIntegration::drag() const { - return m_drag; + return m_connection->drag(); } |