diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-31 02:08:46 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-31 02:08:46 (GMT) |
| commit | c0baaf9b1ba5ba5089e230253c2b711cb7d43735 (patch) | |
| tree | 4a0d6968fc5137ad31f37620c2eb9de087bf0843 /src/gui/painting/qregion.h | |
| parent | af8689cb4f2975ec7f8658a709195d9be4aff33f (diff) | |
| parent | 1835decbcfe6c95de3c895cb5bf2d0cefe4d2643 (diff) | |
| download | Qt-c0baaf9b1ba5ba5089e230253c2b711cb7d43735.zip Qt-c0baaf9b1ba5ba5089e230253c2b711cb7d43735.tar.gz Qt-c0baaf9b1ba5ba5089e230253c2b711cb7d43735.tar.bz2 | |
Merge branch 'master' of ../../qt into kinetic-declarativeui
Conflicts:
src/corelib/kernel/kernel.pri
src/corelib/kernel/qabstractitemmodel.cpp
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qmetaobject.h
Diffstat (limited to 'src/gui/painting/qregion.h')
| -rw-r--r-- | src/gui/painting/qregion.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h index bfedcb1..84024ce 100644 --- a/src/gui/painting/qregion.h +++ b/src/gui/painting/qregion.h @@ -59,7 +59,7 @@ QT_MODULE(Gui) template <class T> class QVector; class QVariant; -#if defined(Q_WS_QWS) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_OS_WINCE) +#if defined(Q_WS_QWS) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_WIN) struct QRegionPrivate; #endif @@ -148,6 +148,7 @@ public: #elif defined(Q_WS_MAC) #if defined Q_WS_MAC32 RgnHandle toQDRgn() const; + RgnHandle toQDRgnForUpdate_sys() const; static QRegion fromQDRgn(RgnHandle shape); #endif #ifdef QT_MAC_USE_COCOA @@ -199,7 +200,7 @@ private: #elif defined(Q_WS_MAC) && !defined(QT_MAC_USE_COCOA) mutable RgnHandle unused; // Here for binary compatability reasons. ### Qt 5 remove. #endif -#if defined(Q_WS_QWS) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_OS_WINCE) +#if defined(Q_WS_QWS) || defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_WIN) QRegionPrivate *qt_rgn; #endif }; |