From d3e3404d570373fcb746c89827990aa2a9a4cb17 Mon Sep 17 00:00:00 2001
From: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Date: Thu, 17 May 2012 05:15:08 +0900
Subject: Fix QtWidgets compilation for -qconfig large

Change-Id: I90ea78944546e93debb41c901d9f128a7b29b1f4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 src/widgets/kernel/qwidgetwindow_qpa.cpp | 6 ++++++
 src/widgets/kernel/qwidgetwindow_qpa_p.h | 4 ++++
 2 files changed, 10 insertions(+)

(limited to 'src/widgets/kernel')

diff --git a/src/widgets/kernel/qwidgetwindow_qpa.cpp b/src/widgets/kernel/qwidgetwindow_qpa.cpp
index 720c6bf868..5ddb596b4f 100644
--- a/src/widgets/kernel/qwidgetwindow_qpa.cpp
+++ b/src/widgets/kernel/qwidgetwindow_qpa.cpp
@@ -154,12 +154,14 @@ bool QWidgetWindow::event(QEvent *event)
         handleWheelEvent(static_cast<QWheelEvent *>(event));
         return true;
 
+#ifndef QT_NO_DRAGANDDROP
     case QEvent::DragEnter:
     case QEvent::DragLeave:
     case QEvent::DragMove:
     case QEvent::Drop:
         handleDragEvent(event);
         break;
+#endif
 
     case QEvent::Expose:
         handleExposeEvent(static_cast<QExposeEvent *>(event));
@@ -390,6 +392,8 @@ void QWidgetWindow::handleWheelEvent(QWheelEvent *event)
     QGuiApplication::sendSpontaneousEvent(widget, &translated);
 }
 
+#ifndef QT_NO_DRAGANDDROP
+
 void QWidgetWindow::handleDragEvent(QEvent *event)
 {
     switch (event->type()) {
@@ -448,6 +452,8 @@ void QWidgetWindow::handleDragEvent(QEvent *event)
     }
 }
 
+#endif // QT_NO_DRAGANDDROP
+
 void QWidgetWindow::handleExposeEvent(QExposeEvent *event)
 {
     if (isExposed()) {
diff --git a/src/widgets/kernel/qwidgetwindow_qpa_p.h b/src/widgets/kernel/qwidgetwindow_qpa_p.h
index 80af5e6b77..515cb4d919 100644
--- a/src/widgets/kernel/qwidgetwindow_qpa_p.h
+++ b/src/widgets/kernel/qwidgetwindow_qpa_p.h
@@ -78,7 +78,9 @@ protected:
     void handleMoveEvent(QMoveEvent *);
     void handleResizeEvent(QResizeEvent *);
     void handleWheelEvent(QWheelEvent *);
+#ifndef QT_NO_DRAGANDDROP
     void handleDragEvent(QEvent *);
+#endif
     void handleExposeEvent(QExposeEvent *);
     void handleWindowStateChangedEvent(QWindowStateChangeEvent *event);
     bool nativeEvent(const QByteArray &eventType, void *message, long *result);
@@ -91,7 +93,9 @@ private:
 
     QWidget *m_widget;
     QWeakPointer<QWidget> m_implicit_mouse_grabber;
+#ifndef QT_NO_DRAGANDDROP
     QWeakPointer<QWidget> m_dragTarget;
+#endif
 };
 
 QT_END_NAMESPACE
-- 
cgit v1.2.3