45cd411474
- simplified PKGBUILD recipe - build in silent mode - make sure we link with static zlib and zstd - fix qmltyperegistrar 'Cannot open foreign types file' error - fix race condition when building qtactiveqt tools - fix *.pc & *.prl files further by removing full path to libs
15 lines
719 B
Diff
15 lines
719 B
Diff
diff -Naur qt-everywhere-src-5.12.4-orig/qtbase/qmake/generators/win32/mingw_make.cpp qt-everywhere-src-5.12.4/qtbase/qmake/generators/win32/mingw_make.cpp
|
|
--- qt-everywhere-src-5.12.4-orig/qtbase/qmake/generators/win32/mingw_make.cpp 2019-06-12 23:59:14.000000000 +0300
|
|
+++ qt-everywhere-src-5.12.4/qtbase/qmake/generators/win32/mingw_make.cpp 2019-06-15 15:34:10.657701800 +0300
|
|
@@ -147,7 +147,9 @@
|
|
|
|
processVars();
|
|
|
|
- project->values("LIBS") += project->values("RES_FILE");
|
|
+ if (project->isActiveConfig("shared") || project->first("TEMPLATE") == "app") {
|
|
+ project->values("LIBS") += project->values("RES_FILE");
|
|
+ }
|
|
|
|
if (project->isActiveConfig("dll")) {
|
|
QString destDir = "";
|