diff options
Diffstat (limited to 'mkspecs/features/winrt')
| -rw-r--r-- | mkspecs/features/winrt/default_pre.prf | 22 | ||||
| -rw-r--r-- | mkspecs/features/winrt/package_manifest.prf | 4 |
2 files changed, 10 insertions, 16 deletions
diff --git a/mkspecs/features/winrt/default_pre.prf b/mkspecs/features/winrt/default_pre.prf index f79d04ce41..8b9c1d7663 100644 --- a/mkspecs/features/winrt/default_pre.prf +++ b/mkspecs/features/winrt/default_pre.prf @@ -1,15 +1,13 @@ -*msvc2015|*msvc2017 { - # Note that the order is important - ucrt(d) has to be first. - # Otherwise, the linker might use malloc from a different library, - # but free_dbg() from the runtime, causing an assertion failure - # due to deleting an item from a different heap. - # vcruntime(d) is necessary when we don't link to any libraries - # which would pull it in transitively. - CONFIG(debug, debug|release): \ - QMAKE_LIBS = ucrtd.lib vcruntimed.lib $$QMAKE_LIBS - else: \ - QMAKE_LIBS = ucrt.lib vcruntime.lib $$QMAKE_LIBS -} +# Note that the order is important - ucrt(d) has to be first. +# Otherwise, the linker might use malloc from a different library, +# but free_dbg() from the runtime, causing an assertion failure +# due to deleting an item from a different heap. +# vcruntime(d) is necessary when we don't link to any libraries +# which would pull it in transitively. +CONFIG(debug, debug|release): \ + QMAKE_LIBS = ucrtd.lib vcruntimed.lib $$QMAKE_LIBS +else: \ + QMAKE_LIBS = ucrt.lib vcruntime.lib $$QMAKE_LIBS equals(TEMPLATE, "vcapp"): CONFIG += windeployqt diff --git a/mkspecs/features/winrt/package_manifest.prf b/mkspecs/features/winrt/package_manifest.prf index e0e421ed9a..8f4a7a6eab 100644 --- a/mkspecs/features/winrt/package_manifest.prf +++ b/mkspecs/features/winrt/package_manifest.prf @@ -59,7 +59,6 @@ # Provide the C-runtime dependency equals(TEMPLATE, "app") { VCLIBS = Microsoft.VCLibs.$$replace(MSVC_VER, \\., ).00 - winphone: VCLIBS = $${VCLIBS}.Phone CONFIG(debug, debug|release): \ VCLIBS = $${VCLIBS}.Debug else: \ @@ -103,7 +102,6 @@ INDENT = "$$escape_expand(\\r\\n) " VS_XML_NAMESPACE = "m2" - winphone: VS_XML_NAMESPACE = "m3" WINRT_MANIFEST.rotation_preference = $$unique(WINRT_MANIFEST.rotation_preference) !isEmpty(WINRT_MANIFEST.rotation_preference) { MANIFEST_ROTATION += "<$${VS_XML_NAMESPACE}:InitialRotationPreference>" @@ -150,10 +148,8 @@ # is already inside the MSVC2015 manifest. WINRT_MANIFEST.dependencies = $$unique(WINRT_MANIFEST.dependencies) !isEmpty(WINRT_MANIFEST.dependencies) { - *-msvc2013: MANIFEST_DEPENDENCIES += "<Dependencies>" for(DEPENDENCY, WINRT_MANIFEST.dependencies): \ MANIFEST_DEPENDENCIES += " <PackageDependency Name=\"$$DEPENDENCY\" />" - *-msvc2013: MANIFEST_DEPENDENCIES += "</Dependencies>" WINRT_MANIFEST.dependencies = $$join(MANIFEST_DEPENDENCIES, $$INDENT, $$INDENT) } |