diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-04-13 09:01:43 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-05-29 18:31:35 +0000 |
| commit | 9f27bfb31acfba49a74a342d9249f24633a7ade2 (patch) | |
| tree | b156192def25d688ff924b60f1c8defadd86c351 /src/plugins/platforms/offscreen | |
| parent | dd8e73504edbf71808d6585b7a08daddcdcbf18e (diff) | |
Make sure we can build with -no-feature-draganddrop
We move QInternalMimeData to a separate file, because this class is
used, even if draganddrop is disabled. From now on, include
qinternalmimedata_p.h instead of qdnd_p.h for QInternalMimeData.
Change-Id: I594e08e2e90d574dc445119091686b4b69e4731b
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'src/plugins/platforms/offscreen')
| -rw-r--r-- | src/plugins/platforms/offscreen/qoffscreencommon.h | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/offscreen/qoffscreenintegration.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/offscreen/qoffscreenintegration.h | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/platforms/offscreen/qoffscreencommon.h b/src/plugins/platforms/offscreen/qoffscreencommon.h index 541c07384c..f4f0142911 100644 --- a/src/plugins/platforms/offscreen/qoffscreencommon.h +++ b/src/plugins/platforms/offscreen/qoffscreencommon.h @@ -41,7 +41,9 @@ #define QOFFSCREENCOMMON_H #include <qpa/qplatformbackingstore.h> +#if QT_CONFIG(draganddrop) #include <qpa/qplatformdrag.h> +#endif #include <qpa/qplatformintegration.h> #include <qpa/qplatformscreen.h> #include <qpa/qplatformwindow.h> @@ -71,7 +73,7 @@ public: QScopedPointer<QPlatformCursor> m_cursor; }; -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) class QOffscreenDrag : public QPlatformDrag { public: diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp index 75bb786b28..01cd254501 100644 --- a/src/plugins/platforms/offscreen/qoffscreenintegration.cpp +++ b/src/plugins/platforms/offscreen/qoffscreenintegration.cpp @@ -109,7 +109,7 @@ QOffscreenIntegration::QOffscreenIntegration() m_fontDatabase.reset(new QFreeTypeFontDatabase()); #endif -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) m_drag.reset(new QOffscreenDrag); #endif m_services.reset(new QPlatformServices); @@ -204,7 +204,7 @@ QPlatformFontDatabase *QOffscreenIntegration::fontDatabase() const return m_fontDatabase.data(); } -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) QPlatformDrag *QOffscreenIntegration::drag() const { return m_drag.data(); diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration.h b/src/plugins/platforms/offscreen/qoffscreenintegration.h index a1e3a9bde8..fc988126bb 100644 --- a/src/plugins/platforms/offscreen/qoffscreenintegration.h +++ b/src/plugins/platforms/offscreen/qoffscreenintegration.h @@ -59,7 +59,7 @@ public: QPlatformWindow *createPlatformWindow(QWindow *window) const override; QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override; -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) QPlatformDrag *drag() const override; #endif @@ -76,7 +76,7 @@ public: private: QScopedPointer<QPlatformFontDatabase> m_fontDatabase; -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) QScopedPointer<QPlatformDrag> m_drag; #endif QScopedPointer<QPlatformInputContext> m_inputContext; |