diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-05 23:26:35 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-05 23:26:35 (GMT) |
| commit | 6df1cbd3890ecbe8d487d15e367eabace43f255d (patch) | |
| tree | 1e0ff1aeadbfe947aefd68d6a407279bdfbde8da /src/corelib/global/qglobal.h | |
| parent | f98a10ed41f181252d83e9cebaa3772d556f6266 (diff) | |
| parent | d32782a91982c50c72aed170f3bab2024ff8b4f3 (diff) | |
| download | Qt-6df1cbd3890ecbe8d487d15e367eabace43f255d.zip Qt-6df1cbd3890ecbe8d487d15e367eabace43f255d.tar.gz Qt-6df1cbd3890ecbe8d487d15e367eabace43f255d.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 45d4fa7..41265ba 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -763,6 +763,10 @@ namespace QtExperimental {} # endif #elif defined(Q_OS_WINCE) # define Q_WS_WIN32 +# define Q_WS_WINCE +# if defined(Q_OS_WINCE_WM) +# define Q_WS_WINCE_WM +# endif #elif defined(Q_OS_OS2) # define Q_WS_PM # error "Qt does not work with OS/2 Presentation Manager or Workplace Shell" @@ -780,10 +784,11 @@ namespace QtExperimental {} # endif #endif -#if defined(Q_WS_WIN16) || defined(Q_WS_WIN32) +#if defined(Q_WS_WIN16) || defined(Q_WS_WIN32) || defined(Q_WS_WINCE) # define Q_WS_WIN #endif + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE |