summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2015-02-27 11:24:01 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2015-02-27 19:56:34 +0100
commitacbb72d884aecb02de29006081fa55efe8cac9f8 (patch)
treed2b739e627cfd704f8bab126064ecb8793eef8b4 /recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch
parentceb2a0b2a947fe02a3a317a69ee5a28b90cabf5a (diff)
downloadmeta-qt5-acbb72d884aecb02de29006081fa55efe8cac9f8.tar.gz
recipes-git: update to latest revisions in 5.4 branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch')
-rw-r--r--recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch b/recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch
index 90dacc20..82505a7a 100644
--- a/recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch
+++ b/recipes-qt/qt5/qtbase-git/0012-Add-external-hostbindir-option-for-native-sdk.patch
@@ -1,4 +1,4 @@
1From dee6fc781f5ac77155817b82f9d66787690a3bb3 Mon Sep 17 00:00:00 2001 1From e598364920b2ff4a90aaaaeb0c58162d1cb64221 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com> 2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 6 Apr 2013 13:15:07 +0200 3Date: Sat, 6 Apr 2013 13:15:07 +0200
4Subject: [PATCH 12/13] Add -external-hostbindir option for native(sdk) 4Subject: [PATCH 12/13] Add -external-hostbindir option for native(sdk)
@@ -45,7 +45,7 @@ index 051e056..50da6ed 100644
45 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true }, 45 { "QMAKE_XSPEC", QLibraryInfo::TargetSpecPath, true },
46 }; 46 };
47diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp 47diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
48index c418c5e..c8c4188 100644 48index 91ca643..7a567fa 100644
49--- a/src/corelib/global/qlibraryinfo.cpp 49--- a/src/corelib/global/qlibraryinfo.cpp
50+++ b/src/corelib/global/qlibraryinfo.cpp 50+++ b/src/corelib/global/qlibraryinfo.cpp
51@@ -348,7 +348,7 @@ QLibraryInfo::isDebugBuild() 51@@ -348,7 +348,7 @@ QLibraryInfo::isDebugBuild()
@@ -104,5 +104,5 @@ index 6e9d4aa..0ca4daf 100644
104 << " \"qt_hostspec=" << hostSpec << "\"," << endl 104 << " \"qt_hostspec=" << hostSpec << "\"," << endl
105 << "#endif" << endl 105 << "#endif" << endl
106-- 106--
1072.3.0 1072.3.1
108 108