From: Mirko Vogt <mirko-dev@nanl.de>
Date: Tue, 24 Jan 2017 19:00:38 +0000 (+0100)
Subject: Make Qt less smart about cross-toolchain detection and pkgconfig
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=28c376c9a85e2506f37709ef3c6c653fe3397302;p=feed%2Fvideo.git

Make Qt less smart about cross-toolchain detection and pkgconfig

When using the pkgconfig macros inside qmake
project files, qmake silently returns since it
detects being run inside a cross-toolchain and
pkgconfig normally doesn't work as expected in
such an environment.

However we patched pkgconfig to work inside
OpenWrt / LEDE (pkgconfig.real), so stop Qt
failing for qmake projects using pkgconfig.
---

diff --git a/frameworks/qt5base/patches/001-fix-pkgconfig-xcompile-detection.patch b/frameworks/qt5base/patches/001-fix-pkgconfig-xcompile-detection.patch
index 680f289..075ab3f 100644
--- a/frameworks/qt5base/patches/001-fix-pkgconfig-xcompile-detection.patch
+++ b/frameworks/qt5base/patches/001-fix-pkgconfig-xcompile-detection.patch
@@ -9,3 +9,14 @@
              }
  
              pkgConfigSysrootDir = $$sysroot
+--- qtbase-opensource-src-5.8.0-rc/mkspecs/features/qt_functions.prf.orig	2017-01-19 17:52:11.741970700 +0100
++++ qtbase-opensource-src-5.8.0-rc/mkspecs/features/qt_functions.prf	2017-01-19 17:52:06.641997235 +0100
+@@ -272,7 +272,7 @@
+                         warning("Disabling pkg-config since PKG_CONFIG_SYSROOT_DIR is not set.")
+                         warning("Set this variable to your sysroot for pkg-config to function")
+                         warning("correctly when cross-compiling.")
+-                        return()
++#                        return()
+                     }
+ 
+                     pkgConfigSysrootDir = $$sysroot