Blob Blame History Raw
diff -rupN --no-dereference qtbase-everywhere-src-5.15.1/configure.pri qtbase-everywhere-src-5.15.1-new/configure.pri
--- qtbase-everywhere-src-5.15.1/configure.pri	2020-09-02 12:15:07.000000000 +0200
+++ qtbase-everywhere-src-5.15.1-new/configure.pri	2020-10-06 14:20:54.770913125 +0200
@@ -351,8 +351,11 @@ defineTest(qtConfTest_detectPkgConfig) {
             qtLog("Found pkg-config from path: $$pkgConfig")
         }
     }
+    !isEmpty(pkgConfig):!$$qtConfEvaluate("features.shared") {
+        pkgConfig = "$$pkgConfig --static"
+    }
 
-    $$qtConfEvaluate("features.cross_compile") {
+    false {
         # cross compiling, check that pkg-config is set up sanely
         sysroot = $$config.input.sysroot