From 1e662ff1666f0a47eed84ae9e6bc02869aa19f9b Mon Sep 17 00:00:00 2001
From: Maurice Kalinowski <maurice.kalinowski@qt.io>
Date: Fri, 1 Jul 2016 08:29:08 +0200
Subject: winrt: Set minimum SDK version to 10586

10586 reflects Update 1, which is the mininum supported version for many
months, hence reflext this in the manifest template as well.

There are additional features (like drag and drop) which require and
even later SDK version. However, they do not reflect the minimum.

Change-Id: I6d71dc499c928ed98c8a25283e0b53994317bb00
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mkspecs')

diff --git a/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in b/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
index c25d7b77af..fc6bfcebcf 100644
--- a/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
+++ b/mkspecs/common/winrt_winphone/manifests/10.0/AppxManifest.xml.in
@@ -22,7 +22,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name=\"Windows.Universal\" MinVersion=\"10.0.10240.0\" MaxVersionTested=\"10.0.10586.0\" />$${WINRT_MANIFEST.dependencies}
+    <TargetDeviceFamily Name=\"Windows.Universal\" MinVersion=\"10.0.10586.0\" MaxVersionTested=\"10.0.10586.0\" />$${WINRT_MANIFEST.dependencies}
   </Dependencies>
 
   <Resources>
-- 
cgit v1.2.3


From cc42979e4653f8fc543b6968c9ff08f4356fa724 Mon Sep 17 00:00:00 2001
From: Ralf Nolden <nolden@kde.org>
Date: Wed, 29 Jun 2016 11:54:33 +0200
Subject: NetBSD: add QMAKE_RPATHDIR for standard QMAKE_LIBDIR

NetBSD is heavily dependent on using rpath, so we need to add the
lib dir QMAKE_LIBDIR and QMAKE_LIBDIR_X11 to QMAKE_RPATHDIR
explicitly to avoid linker errors. See http://www.netbsd.org/docs/elf.html
for more info.

Change-Id: I225143d5e2d9a125060b14e3a8a7953927d63b33
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
---
 mkspecs/netbsd-g++/qmake.conf | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'mkspecs')

diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf
index 31005d9134..a4b26837ce 100644
--- a/mkspecs/netbsd-g++/qmake.conf
+++ b/mkspecs/netbsd-g++/qmake.conf
@@ -17,6 +17,9 @@ QMAKE_LIBDIR_X11        = /usr/X11R7/lib
 QMAKE_INCDIR_OPENGL     = /usr/X11R7/include
 QMAKE_LIBDIR_OPENGL     = /usr/X11R7/lib
 
+# NetBSD requires rpath to be used for all lib dirs, see http://www.netbsd.org/docs/elf.html
+QMAKE_RPATHDIR         += $$QMAKE_LIBDIR $$QMAKE_LIBDIR_X11
+
 include(../common/gcc-base-unix.conf)
 include(../common/g++-unix.conf)
 load(qt_config)
-- 
cgit v1.2.3


From cf9b445ed471451cd581962887c6fd503cd2bf25 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Mon, 30 May 2016 10:30:35 -0300
Subject: Fix the naming of an LLVM tool in common/clang.conf

Probably was copied from the gcc equivalent.

Change-Id: I87e17314d8b24ae983b1fffd14535b9d7f616a1b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
---
 mkspecs/common/clang.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mkspecs')

diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf
index ee9c1b8371..e003b947aa 100644
--- a/mkspecs/common/clang.conf
+++ b/mkspecs/common/clang.conf
@@ -40,5 +40,5 @@ QMAKE_LFLAGS_LTCG       = $$QMAKE_CFLAGS_LTCG
 
 # Wrapper tools that understand .o/.a files with LLVM bytecode instead of machine code
 QMAKE_AR_LTCG           = llvm-ar cqs
-QMAKE_NM_LTCG           = gcc-nm -P
+QMAKE_NM_LTCG           = llvm-nm -P
 QMAKE_RANLIB_LTCG       = true      # No need to run, since llvm-ar has "s"
-- 
cgit v1.2.3