Make Qt less smart about cross-toolchain detection and pkgconfig
[feed/video.git] / frameworks / qt5base / patches / 001-fix-pkgconfig-xcompile-detection.patch
1 --- qtbase-opensource-src-5.8.0-beta/configure.pri.orig 2016-11-20 20:06:38.811897204 +0100
2 +++ qtbase-opensource-src-5.8.0-beta/configure.pri 2016-11-20 20:06:54.279928752 +0100
3 @@ -174,7 +174,7 @@
4 "Disabling pkg-config since PKG_CONFIG_SYSROOT_DIR is not set." \
5 "Set this variable to your sysroot for pkg-config to function correctly when" \
6 "cross-compiling or use -pkg-config to override this test.")
7 - return(false)
8 +# return(false)
9 }
10
11 pkgConfigSysrootDir = $$sysroot
12 --- qtbase-opensource-src-5.8.0-rc/mkspecs/features/qt_functions.prf.orig 2017-01-19 17:52:11.741970700 +0100
13 +++ qtbase-opensource-src-5.8.0-rc/mkspecs/features/qt_functions.prf 2017-01-19 17:52:06.641997235 +0100
14 @@ -272,7 +272,7 @@
15 warning("Disabling pkg-config since PKG_CONFIG_SYSROOT_DIR is not set.")
16 warning("Set this variable to your sysroot for pkg-config to function")
17 warning("correctly when cross-compiling.")
18 - return()
19 +# return()
20 }
21
22 pkgConfigSysrootDir = $$sysroot