From 9f27bfb31acfba49a74a342d9249f24633a7ade2 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 13 Apr 2018 09:01:43 +0200 Subject: 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 --- src/plugins/platforms/qnx/qqnxintegration.cpp | 6 +++--- src/plugins/platforms/qnx/qqnxintegration.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/plugins/platforms/qnx') diff --git a/src/plugins/platforms/qnx/qqnxintegration.cpp b/src/plugins/platforms/qnx/qqnxintegration.cpp index bffe7ee34b..6085cd34c0 100644 --- a/src/plugins/platforms/qnx/qqnxintegration.cpp +++ b/src/plugins/platforms/qnx/qqnxintegration.cpp @@ -139,7 +139,7 @@ QQnxIntegration::QQnxIntegration(const QStringList ¶mList) , m_clipboard(0) #endif , m_navigator(0) -#if !defined(QT_NO_DRAGANDDROP) +#if QT_CONFIG(draganddrop) , m_drag(new QSimpleDrag()) #endif { @@ -212,7 +212,7 @@ QQnxIntegration::~QQnxIntegration() qIntegrationDebug("platform plugin shutdown begin"); delete m_nativeInterface; -#if !defined(QT_NO_DRAGANDDROP) +#if QT_CONFIG(draganddrop) // Destroy the drag object delete m_drag; #endif @@ -419,7 +419,7 @@ QPlatformClipboard *QQnxIntegration::clipboard() const } #endif -#if !defined(QT_NO_DRAGANDDROP) +#if QT_CONFIG(draganddrop) QPlatformDrag *QQnxIntegration::drag() const { return m_drag; diff --git a/src/plugins/platforms/qnx/qqnxintegration.h b/src/plugins/platforms/qnx/qqnxintegration.h index d1ebb1d4bf..f11afa1748 100644 --- a/src/plugins/platforms/qnx/qqnxintegration.h +++ b/src/plugins/platforms/qnx/qqnxintegration.h @@ -113,7 +113,7 @@ public: #if !defined(QT_NO_CLIPBOARD) QPlatformClipboard *clipboard() const override; #endif -#if !defined(QT_NO_DRAGANDDROP) +#if QT_CONFIG(draganddrop) QPlatformDrag *drag() const override; #endif QVariant styleHint(StyleHint hint) const override; @@ -158,7 +158,7 @@ private: mutable QQnxClipboard* m_clipboard; #endif QQnxAbstractNavigator *m_navigator; -#if !defined(QT_NO_DRAGANDDROP) +#if QT_CONFIG(draganddrop) QSimpleDrag *m_drag; #endif static QQnxWindowMapper ms_windowMapper; -- cgit v1.2.3