mirror of
https://github.com/openwrt/video.git
synced 2025-12-21 19:14:35 +04:00
28c376c9a8
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.
23 lines
1.2 KiB
Diff
23 lines
1.2 KiB
Diff
--- qtbase-opensource-src-5.8.0-beta/configure.pri.orig 2016-11-20 20:06:38.811897204 +0100
|
|
+++ qtbase-opensource-src-5.8.0-beta/configure.pri 2016-11-20 20:06:54.279928752 +0100
|
|
@@ -174,7 +174,7 @@
|
|
"Disabling pkg-config since PKG_CONFIG_SYSROOT_DIR is not set." \
|
|
"Set this variable to your sysroot for pkg-config to function correctly when" \
|
|
"cross-compiling or use -pkg-config to override this test.")
|
|
- return(false)
|
|
+# return(false)
|
|
}
|
|
|
|
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
|