diff options
| author | Morten Sørvig <msorvig@trolltech.com> | 2009-07-30 12:25:41 (GMT) |
|---|---|---|
| committer | Morten Sørvig <msorvig@trolltech.com> | 2009-07-30 12:25:41 (GMT) |
| commit | 2fb1b5378e551a42554b42c028226e65b3b41593 (patch) | |
| tree | 48359652b4b09cdc37a91297489fd7e6985c27a9 /src/gui/painting/qregion.h | |
| parent | 26e9f4e077c49d1191835def595e4fb70ee50be2 (diff) | |
| parent | 66a3c503e8e99b8cd28c2fef2b0a869f27c7efe7 (diff) | |
| download | Qt-2fb1b5378e551a42554b42c028226e65b3b41593.zip Qt-2fb1b5378e551a42554b42c028226e65b3b41593.tar.gz Qt-2fb1b5378e551a42554b42c028226e65b3b41593.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/painting/qregion.h')
| -rw-r--r-- | src/gui/painting/qregion.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h index 6dfdc83..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 @@ -200,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 }; |