From ed529bbf4992a12163070c9a92af1a6a4e5b97aa Mon Sep 17 00:00:00 2001
From: Olli Werwolff <qt-info@nokia.com>
Date: Wed, 25 May 2011 10:11:58 +0200
Subject: Compile fix for QtGui when configure with -qpa on Windows

Reviewed-by: Friedemann Kleint
---
 src/gui/painting/painting.pri   | 6 +++---
 src/gui/painting/qmemrotate_p.h | 2 +-
 src/gui/painting/qregion.cpp    | 8 ++++----
 src/gui/painting/qregion.h      | 3 +++
 4 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/gui/painting')

diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index 5379b6545e..3e284c04c1 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -94,7 +94,7 @@ SOURCES += \
                 painting/qpaintengine_blitter_p.h       \
                 painting/qblittable_p.h                 \
 
-win32 {
+win32:!qpa {
         HEADERS += painting/qprintengine_win_p.h
 
         SOURCES += \
@@ -131,7 +131,7 @@ unix:x11 {
                 painting/qprintengine_mac.mm \
 }
 
-unix:!mac:!symbian|qpa {
+unix:!mac:!symbian {
         HEADERS += \
                 painting/qprinterinfo_unix_p.h
         SOURCES += \
@@ -154,7 +154,7 @@ symbian {
                 painting/qpaintengine_s60_p.h
 }
 
-x11|qpa {
+x11|qpa:!win32 {
         contains(QT_CONFIG,qtopia) {
             DEFINES += QT_NO_CUPS QT_NO_LPR
         } else {
diff --git a/src/gui/painting/qmemrotate_p.h b/src/gui/painting/qmemrotate_p.h
index 019576a446..84b0b01846 100644
--- a/src/gui/painting/qmemrotate_p.h
+++ b/src/gui/painting/qmemrotate_p.h
@@ -70,7 +70,7 @@ QT_BEGIN_NAMESPACE
 #endif
 #endif
 
-#ifdef Q_WS_QWS
+#if defined(Q_WS_QWS) || defined(Q_WS_QPA) && defined(Q_OS_WIN)
 #define Q_GUI_QWS_EXPORT Q_GUI_EXPORT
 #else
 #define Q_GUI_QWS_EXPORT
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp
index 7166ec7e12..0e58331768 100644
--- a/src/gui/painting/qregion.cpp
+++ b/src/gui/painting/qregion.cpp
@@ -542,7 +542,7 @@ QRegion& QRegion::operator|=(const QRegion &r)
 
     \sa intersected()
 */
-#if !defined (Q_OS_UNIX) && !defined (Q_WS_WIN)
+#if !defined (Q_OS_UNIX) && !defined (Q_OS_WIN)
 QRegion& QRegion::operator+=(const QRect &r)
 {
     return operator+=(QRegion(r));
@@ -565,7 +565,7 @@ QRegion& QRegion::operator&=(const QRegion &r)
    \overload
    \since 4.4
  */
-#if defined (Q_OS_UNIX) || defined (Q_WS_WIN)
+#if defined (Q_OS_UNIX) || defined (Q_OS_WIN)
 QRegion& QRegion::operator&=(const QRect &r)
 {
     return *this = *this & r;
@@ -709,7 +709,7 @@ bool QRegion::intersects(const QRegion &region) const
 */
 
 
-#if !defined (Q_OS_UNIX) && !defined (Q_WS_WIN)
+#if !defined (Q_OS_UNIX) && !defined (Q_OS_WIN)
 /*!
     \overload
     \since 4.4
@@ -1072,7 +1072,7 @@ Q_AUTOTEST_EXPORT QPainterPath qt_regionToPath(const QRegion &region)
     return result;
 }
 
-#if defined(Q_OS_UNIX) || defined(Q_WS_WIN)
+#if defined(Q_OS_UNIX) || defined(Q_OS_WIN)
 
 //#define QT_REGION_DEBUG
 /*
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h
index 2a9a98d99a..75d29e1ef5 100644
--- a/src/gui/painting/qregion.h
+++ b/src/gui/painting/qregion.h
@@ -183,6 +183,9 @@ private:
 #elif defined(Q_WS_MAC)
     static OSStatus shape2QRegionHelper(int inMessage, HIShapeRef inShape,
                                         const CGRect *inRect, void *inRefcon);
+#endif
+#if defined(Q_WS_QWS) || defined(Q_WS_QPA)
+Q_GUI_EXPORT
 #endif
     friend bool qt_region_strictContains(const QRegion &region,
                                          const QRect &rect);
-- 
cgit v1.2.3