winrt: use correct winapi family defines in mkspecs and system detection

WINAPI_FAMILY_APP is deprecated, so use WINAPI_FAMILY_PC_APP instead. Also, open up the phone partition for use on MSVC2015. Change-Id: I7476d71c31395b2914f5a1439e8088341976bf2f Reviewed-by: Maurice Kalinowski <[email protected]>
RDevCore · Oct 20, 2015 · e19bedc · e19bedc
1 parent 4388c6a
commit e19bedc
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/mkspecs/winrt-arm-msvc2013/qmake.conf b/mkspecs/winrt-arm-msvc2013/qmake.conf
@@ -6,7 +6,7 @@
 
 include(../common/winrt_winphone/qmake.conf)
 QMAKE_COMPILER_DEFINES += _MSC_VER=1800
-DEFINES                += WINAPI_FAMILY=WINAPI_FAMILY_APP ARM __ARM__ __arm__
+DEFINES                += WINAPI_FAMILY=WINAPI_FAMILY_PC_APP ARM __ARM__ __arm__
 
 QMAKE_CFLAGS           += -FS
 QMAKE_CXXFLAGS         += -FS

diff --git a/mkspecs/winrt-arm-msvc2015/qmake.conf b/mkspecs/winrt-arm-msvc2015/qmake.conf
@@ -6,7 +6,7 @@
 
 include(../common/winrt_winphone/qmake.conf)
 QMAKE_COMPILER_DEFINES += _MSC_VER=1900
-DEFINES                += WINAPI_FAMILY=WINAPI_FAMILY_APP ARM __ARM__ __arm__
+DEFINES                += WINAPI_FAMILY=WINAPI_FAMILY_PC_APP WINAPI_PARTITION_PHONE_APP=1 ARM __ARM__ __arm__
 
 QMAKE_CFLAGS           += -FS
 QMAKE_CXXFLAGS         += -FS

diff --git a/mkspecs/winrt-x64-msvc2015/qmake.conf b/mkspecs/winrt-x64-msvc2015/qmake.conf
@@ -6,7 +6,7 @@
 
 include(../common/winrt_winphone/qmake.conf)
 QMAKE_COMPILER_DEFINES += _MSC_VER=1900 _WIN32
-DEFINES                += WINAPI_FAMILY=WINAPI_FAMILY_APP X64 __X64__ __x64__
+DEFINES                += WINAPI_FAMILY=WINAPI_FAMILY_PC_APP WINAPI_PARTITION_PHONE_APP=1 X64 __X64__ __x64__
 
 QMAKE_CFLAGS           += -FS
 QMAKE_CXXFLAGS         += -FS

diff --git a/mkspecs/winrt-x86-msvc2013/qmake.conf b/mkspecs/winrt-x86-msvc2013/qmake.conf
@@ -6,7 +6,7 @@
 
 include(../common/winrt_winphone/qmake.conf)
 QMAKE_COMPILER_DEFINES += _MSC_VER=1800 _WIN32
-DEFINES                += WINAPI_FAMILY=WINAPI_FAMILY_APP X86 __X86__ __x86__
+DEFINES                += WINAPI_FAMILY=WINAPI_FAMILY_PC_APP X86 __X86__ __x86__
 
 QMAKE_CFLAGS           += -FS
 QMAKE_CXXFLAGS         += -FS

diff --git a/mkspecs/winrt-x86-msvc2015/qmake.conf b/mkspecs/winrt-x86-msvc2015/qmake.conf
@@ -6,7 +6,7 @@
 
 include(../common/winrt_winphone/qmake.conf)
 QMAKE_COMPILER_DEFINES += _MSC_VER=1900 _WIN32
-DEFINES                += WINAPI_FAMILY=WINAPI_FAMILY_APP X86 __X86__ __x86__
+DEFINES                += WINAPI_FAMILY=WINAPI_FAMILY_PC_APP WINAPI_PARTITION_PHONE_APP=1 X86 __X86__ __x86__
 
 QMAKE_CFLAGS           += -FS
 QMAKE_CXXFLAGS         += -FS

diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h
@@ -109,7 +109,7 @@
 #    if defined(WINAPI_FAMILY_PHONE_APP) && WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP
 #      define Q_OS_WINPHONE
 #      define Q_OS_WINRT
-#    elif WINAPI_FAMILY==WINAPI_FAMILY_APP
+#    elif WINAPI_FAMILY==WINAPI_FAMILY_PC_APP
 #      define Q_OS_WINRT
 #    else
 #      define Q_OS_WIN32