diff options
author | Olli Werwolff <qt-info@nokia.com> | 2011-05-25 10:11:58 +0200 |
---|---|---|
committer | Olli Werwolff <qt-info@nokia.com> | 2011-05-26 08:50:23 +0200 |
commit | ed529bbf4992a12163070c9a92af1a6a4e5b97aa (patch) | |
tree | aba91d1ac768cb8853ac4f6bc3b7ae1db6bc1ab1 /src/gui/painting/qregion.cpp | |
parent | 07818c429c6abaa7b7246d3e7cdcfbe642304145 (diff) |
Compile fix for QtGui when configure with -qpa on Windows
Reviewed-by: Friedemann Kleint
Diffstat (limited to 'src/gui/painting/qregion.cpp')
-rw-r--r-- | src/gui/painting/qregion.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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 ®ion) 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 ®ion) return result; } -#if defined(Q_OS_UNIX) || defined(Q_WS_WIN) +#if defined(Q_OS_UNIX) || defined(Q_OS_WIN) //#define QT_REGION_DEBUG /* |