diff options
| author | Tasuku Suzuki <stasuku@gmail.com> | 2013-04-13 00:50:38 +0900 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-19 09:57:09 +0200 |
| commit | 02713994bf9c72a3cf1ab55b780ab23916d6f79b (patch) | |
| tree | 12749fd2b37d9ecfcb57884ac1c533e60eb54a02 /src | |
| parent | f3612f39ff5fb07f83b89732e8b7a643ee6d5cd3 (diff) | |
Make qtbase compile with QT_NO_DRAGANDDROP
Change-Id: Id1a74c6b22b388d20103b4e73f83c8345ec70ba6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/offscreen/qoffscreencommon.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/offscreen/qoffscreenintegration.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/offscreen/qoffscreenintegration.h | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/platforms/offscreen/qoffscreencommon.h b/src/plugins/platforms/offscreen/qoffscreencommon.h index a5df7d05d3..28546aed88 100644 --- a/src/plugins/platforms/offscreen/qoffscreencommon.h +++ b/src/plugins/platforms/offscreen/qoffscreencommon.h @@ -73,12 +73,14 @@ public: QScopedPointer<QPlatformCursor> m_cursor; }; +#ifndef QT_NO_DRAGANDDROP class QOffscreenDrag : public QPlatformDrag { public: QMimeData *platformDropData() { return 0; } Qt::DropAction drag(QDrag *) { return Qt::IgnoreAction; } }; +#endif class QOffscreenBackingStore : public QPlatformBackingStore { diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp index e3fcc7ebb0..5b74ad3b8d 100644 --- a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp +++ b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp @@ -106,7 +106,9 @@ QOffscreenIntegration::QOffscreenIntegration() m_fontDatabase.reset(new QBasicFontDatabase()); #endif +#ifndef QT_NO_DRAGANDDROP m_drag.reset(new QOffscreenDrag); +#endif m_services.reset(new QPlatformServices); QGuiApplicationPrivate::instance()->setEventDispatcher(m_eventDispatcher); @@ -149,10 +151,12 @@ QPlatformFontDatabase *QOffscreenIntegration::fontDatabase() const return m_fontDatabase.data(); } +#ifndef QT_NO_DRAGANDDROP QPlatformDrag *QOffscreenIntegration::drag() const { return m_drag.data(); } +#endif QPlatformServices *QOffscreenIntegration::services() const { diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration.h b/src/plugins/platforms/offscreen/qoffscreenintegration.h index eb03100ec9..b403ce83b3 100644 --- a/src/plugins/platforms/offscreen/qoffscreenintegration.h +++ b/src/plugins/platforms/offscreen/qoffscreenintegration.h @@ -60,7 +60,9 @@ public: QPlatformWindow *createPlatformWindow(QWindow *window) const; QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const; +#ifndef QT_NO_DRAGANDDROP QPlatformDrag *drag() const; +#endif QPlatformServices *services() const; QPlatformFontDatabase *fontDatabase() const; @@ -71,7 +73,9 @@ public: private: QAbstractEventDispatcher *m_eventDispatcher; QScopedPointer<QPlatformFontDatabase> m_fontDatabase; +#ifndef QT_NO_DRAGANDDROP QScopedPointer<QPlatformDrag> m_drag; +#endif QScopedPointer<QPlatformServices> m_services; }; |