diff options
Diffstat (limited to 'src/corelib/global/qsystemdetection.h')
| -rw-r--r-- | src/corelib/global/qsystemdetection.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h index dc9fa7383a..7b1c32663b 100644 --- a/src/corelib/global/qsystemdetection.h +++ b/src/corelib/global/qsystemdetection.h @@ -58,6 +58,7 @@ OS2EMX - XFree86 on OS/2 (not PM) WIN32 - Win32 (Windows 2000/XP/Vista/7 and Windows Server 2003/2008) WINCE - WinCE (Windows CE 5.0) + WINRT - WinRT (Windows 8 Runtime) CYGWIN - Cygwin SOLARIS - Sun Solaris HPUX - HP-UX @@ -105,12 +106,21 @@ # define Q_OS_LINUX #elif defined(__CYGWIN__) # define Q_OS_CYGWIN -#elif !defined(SAG_COM) && (defined(WIN64) || defined(_WIN64) || defined(__WIN64__)) +#elif !defined(SAG_COM) && (!defined(WINAPI_FAMILY) || WINAPI_FAMILY==WINAPI_FAMILY_DESKTOP_APP) && (defined(WIN64) || defined(_WIN64) || defined(__WIN64__)) # define Q_OS_WIN32 # define Q_OS_WIN64 #elif !defined(SAG_COM) && (defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)) # if defined(WINCE) || defined(_WIN32_WCE) # define Q_OS_WINCE +# elif defined(WINAPI_FAMILY) +# if WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP +# define Q_OS_WINPHONE +# define Q_OS_WINRT +# elif WINAPI_FAMILY==WINAPI_FAMILY_APP +# define Q_OS_WINRT +# else +# define Q_OS_WIN32 +# endif # else # define Q_OS_WIN32 # endif @@ -172,7 +182,7 @@ # error "Qt has not been ported to this OS - see http://www.qt-project.org/" #endif -#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) || defined(Q_OS_WINCE) +#if defined(Q_OS_WIN32) || defined(Q_OS_WIN64) || defined(Q_OS_WINCE) || defined(Q_OS_WINRT) # define Q_OS_WIN #endif |