summarylogtreecommitdiffstats
path: root/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch
diff options
context:
space:
mode:
authorMartchus2017-02-09 21:00:00 +0100
committerMartchus2017-02-09 21:00:00 +0100
commit017bc5699e8507491c2acbe88d0fd51185422c11 (patch)
tree13b401ebe2f19ba3c953534dbb1afa4c8f23b2a5 /0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch
parentd5440cf4c6f5db8ea6794b1bdc895ceb9bc55efc (diff)
downloadaur-017bc5699e8507491c2acbe88d0fd51185422c11.tar.gz
Update to 5.8.0
Diffstat (limited to '0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch')
-rw-r--r--0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch b/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch
index e4cdc0c9187..b849cbf70d4 100644
--- a/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch
+++ b/0019-Disable-determing-default-include-and-lib-dirs-at-qm.patch
@@ -1,7 +1,7 @@
-From 6b99dac278b4c41000fd6f92c8d400a82cbe484a Mon Sep 17 00:00:00 2001
+From 698d1f283e96c2d04e7482dc51bb43d43e6fd17c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:20:25 +0200
-Subject: [PATCH 19/26] Disable determing default include and lib dirs at qmake
+Subject: [PATCH 19/30] Disable determing default include and lib dirs at qmake
time when building with mingw-w64
---
@@ -9,10 +9,10 @@ Subject: [PATCH 19/26] Disable determing default include and lib dirs at qmake
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
-index 7691b7db34..d262097f09 100644
+index 3f266dd2a4..258d374ee0 100644
--- a/mkspecs/features/toolchain.prf
+++ b/mkspecs/features/toolchain.prf
-@@ -3,7 +3,7 @@ isEmpty(QMAKE_DEFAULT_INCDIRS):!host_build {
+@@ -13,7 +13,7 @@ isEmpty(QMAKE_DEFAULT_INCDIRS):!host_build {
#
# Get default include and library paths from compiler
#
@@ -22,5 +22,5 @@ index 7691b7db34..d262097f09 100644
cmd_prefix = "LC_ALL=C"
cmd_suffix = "</dev/null >/dev/null"
--
-2.11.0
+2.11.1