From f09fc6c958ac8f0307686cd8a59a1adc92771b0c Mon Sep 17 00:00:00 2001
From: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Date: Mon, 8 Feb 2010 15:12:34 +0100
Subject: Compile fix for embedded.

Reviewed-by: trustme
---
 src/gui/kernel/qapplication.cpp | 2 --
 src/gui/kernel/qapplication_p.h | 4 ----
 src/gui/kernel/qdnd.cpp         | 2 --
 src/gui/kernel/qdnd_p.h         | 2 --
 4 files changed, 10 deletions(-)

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 1fc1b45..bb6aca9 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -5707,7 +5707,6 @@ QGestureManager* QGestureManager::instance()
     return qAppPriv->gestureManager;
 }
 
-#if defined(Q_WS_X11) || defined(Q_WS_WIN)
 // These pixmaps approximate the images in the Windows User Interface Guidelines.
 
 // XPM
@@ -5929,7 +5928,6 @@ QPixmap QApplicationPrivate::getPixmapCursor(Qt::CursorShape cshape)
     }
     return QPixmap();
 }
-#endif
 
 QT_END_NAMESPACE
 
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 0764553..d19d86e 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -518,17 +518,13 @@ public:
 
     QGestureManager *gestureManager;
     QWidget *gestureWidget;
-#if defined(Q_WS_X11) || defined(Q_WS_WIN)
     QPixmap *move_cursor;
     QPixmap *copy_cursor;
     QPixmap *link_cursor;
-#endif
 #if defined(Q_WS_WIN)
     QPixmap *ignore_cursor;
 #endif
-#if defined(Q_WS_X11) || defined(Q_WS_WIN)
     QPixmap getPixmapCursor(Qt::CursorShape cshape);
-#endif
 
     QMap<int, QWeakPointer<QWidget> > widgetForTouchPointId;
     QMap<int, QTouchEvent::TouchPoint> appCurrentTouchPoints;
diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp
index 82708ef..2b3a3d0 100644
--- a/src/gui/kernel/qdnd.cpp
+++ b/src/gui/kernel/qdnd.cpp
@@ -167,7 +167,6 @@ QDragManager *QDragManager::self()
     return instance;
 }
 
-#if defined(Q_WS_X11) || defined(Q_WS_WIN)
 QPixmap QDragManager::dragCursor(Qt::DropAction action) const
 {
     QDragPrivate * d = dragPrivate();
@@ -185,7 +184,6 @@ QPixmap QDragManager::dragCursor(Qt::DropAction action) const
 #endif
     return QPixmap();
 }
-#endif
 
 bool QDragManager::hasCustomDragCursors() const
 {
diff --git a/src/gui/kernel/qdnd_p.h b/src/gui/kernel/qdnd_p.h
index 1eb85ed..033e6a6 100644
--- a/src/gui/kernel/qdnd_p.h
+++ b/src/gui/kernel/qdnd_p.h
@@ -244,9 +244,7 @@ public:
     bool willDrop;
     QEventLoop *eventLoop;
 
-#if defined(Q_WS_X11) || defined(Q_WS_WIN)
     QPixmap dragCursor(Qt::DropAction action) const;
-#endif
 
     bool hasCustomDragCursors() const;
 
-- 
cgit v0.12