diff options
| author | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2016-03-03 14:11:45 +0100 |
|---|---|---|
| committer | Andrew Knight <andrew.knight@intopalo.com> | 2016-03-04 12:15:35 +0000 |
| commit | 04db3f28af549b343fc88a089e0093551585e911 (patch) | |
| tree | 46ed2e31d8b8d405c5a56b798cc6956dc621f3b6 /src | |
| parent | 9a999eb7b09b5ddf1545546b9e71b0326c0bb0d2 (diff) | |
Check if WINAPI_FAMILY_PC_APP is defined before using it
Not all Windows compilers (e.g. MinGW 4.9.2) have WINAPI_FAMILY_PC_APP
defined in their headers and report build failures in several
Qt modules including QtActiveQt. This is fixed by defining the needed
values before they are used.
Task-number: QTBUG-49971
Change-Id: Ib7bac1fe07eb76c64d66fa152427918ee39a2eef
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qsystemdetection.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h index 751c6a9a0e..f1abc88b99 100644 --- a/src/corelib/global/qsystemdetection.h +++ b/src/corelib/global/qsystemdetection.h @@ -106,6 +106,9 @@ # if defined(WINCE) || defined(_WIN32_WCE) # define Q_OS_WINCE # elif defined(WINAPI_FAMILY) +# ifndef WINAPI_FAMILY_PC_APP +# define WINAPI_FAMILY_PC_APP WINAPI_FAMILY_APP +# endif # if defined(WINAPI_FAMILY_PHONE_APP) && WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP # define Q_OS_WINPHONE # define Q_OS_WINRT |