From 9020bdcc336ad580c597533b56a630c7488f7344 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Fri, 13 Nov 2015 13:20:57 +0100 Subject: [PATCH] winrt: Launch application on Windows 10 Mobile final Between the very latest images linking against kernel32.lib has been forbidden. This is completely undocumented and only throws a "dependent dll not found" error. Instead we should link against OneCore for msvc2015, which can be used for Windows 10 Desktop and Mobile. Task-number: QTBUG-49349 Change-Id: I21d32a92dfd41548ca563d3e56c623a0cb297588 Reviewed-by: Oliver Wolff --- mkspecs/winrt-arm-msvc2015/qmake.conf | 4 ++-- mkspecs/winrt-x64-msvc2015/qmake.conf | 4 ++-- mkspecs/winrt-x86-msvc2015/qmake.conf | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/mkspecs/winrt-arm-msvc2015/qmake.conf b/mkspecs/winrt-arm-msvc2015/qmake.conf index 820f66deb1..a5bb342456 100644 --- a/mkspecs/winrt-arm-msvc2015/qmake.conf +++ b/mkspecs/winrt-arm-msvc2015/qmake.conf @@ -10,9 +10,9 @@ DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_PC_APP WINAPI_PARTITION_PH QMAKE_CFLAGS += -FS QMAKE_CXXFLAGS += -FS -QMAKE_LFLAGS += /MACHINE:ARM +QMAKE_LFLAGS += /MACHINE:ARM /NODEFAULTLIB:kernel32.lib -QMAKE_LIBS += windowscodecs.lib WindowsApp.lib runtimeobject.lib kernel32.lib +QMAKE_LIBS += windowscodecs.lib WindowsApp.lib runtimeobject.lib OneCore.lib VCPROJ_ARCH = ARM MSVC_VER = 14.0 diff --git a/mkspecs/winrt-x64-msvc2015/qmake.conf b/mkspecs/winrt-x64-msvc2015/qmake.conf index e3edde78c1..5b82f79981 100644 --- a/mkspecs/winrt-x64-msvc2015/qmake.conf +++ b/mkspecs/winrt-x64-msvc2015/qmake.conf @@ -10,9 +10,9 @@ DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_PC_APP WINAPI_PARTITION_PH QMAKE_CFLAGS += -FS QMAKE_CXXFLAGS += -FS -QMAKE_LFLAGS += /MACHINE:X64 +QMAKE_LFLAGS += /MACHINE:X64 /NODEFAULTLIB:kernel32.lib -QMAKE_LIBS += windowscodecs.lib WindowsApp.lib runtimeobject.lib kernel32.lib +QMAKE_LIBS += windowscodecs.lib WindowsApp.lib runtimeobject.lib OneCore.lib VCPROJ_ARCH = x64 MSVC_VER = 14.0 diff --git a/mkspecs/winrt-x86-msvc2015/qmake.conf b/mkspecs/winrt-x86-msvc2015/qmake.conf index 82c6f9bd7f..bc7cf4118e 100644 --- a/mkspecs/winrt-x86-msvc2015/qmake.conf +++ b/mkspecs/winrt-x86-msvc2015/qmake.conf @@ -10,10 +10,9 @@ DEFINES += WINAPI_FAMILY=WINAPI_FAMILY_PC_APP WINAPI_PARTITION_PH QMAKE_CFLAGS += -FS QMAKE_CXXFLAGS += -FS -QMAKE_LFLAGS += /SAFESEH /MACHINE:X86 - -QMAKE_LIBS += windowscodecs.lib WindowsApp.lib runtimeobject.lib kernel32.lib +QMAKE_LFLAGS += /SAFESEH /MACHINE:X86 /NODEFAULTLIB:kernel32.lib +QMAKE_LIBS += windowscodecs.lib WindowsApp.lib runtimeobject.lib OneCore.lib VCPROJ_ARCH = Win32 MSVC_VER = 14.0 WINSDK_VER = 10.0