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
29 lines
1.5 KiB
Diff
29 lines
1.5 KiB
Diff
--- a/qtbase/qmake/generators/makefile.cpp
|
|
+++ b/qtbase/qmake/generators/makefile.cpp
|
|
@@ -323,8 +323,10 @@
|
|
vpath.join(QString("::")).toLatin1().constData());
|
|
if(flags & VPATH_RemoveMissingFiles)
|
|
remove_file = true;
|
|
- else if(flags & VPATH_WarnMissingFiles)
|
|
- warn_msg(WarnLogic, "Failure to find: %s", val.toLatin1().constData());
|
|
+ else if(flags & VPATH_WarnMissingFiles) {
|
|
+ if(!project->isActiveConfig("static"))
|
|
+ warn_msg(WarnLogic, "Failure to find: %s", val.toLatin1().constData());
|
|
+ }
|
|
} else {
|
|
l.removeAt(val_it);
|
|
QString a;
|
|
@@ -341,8 +343,10 @@
|
|
regex.toLatin1().constData(), real_dir.toLatin1().constData());
|
|
if(flags & VPATH_RemoveMissingFiles)
|
|
remove_file = true;
|
|
- else if(flags & VPATH_WarnMissingFiles)
|
|
- warn_msg(WarnLogic, "Failure to find: %s", val.toLatin1().constData());
|
|
+ else if(flags & VPATH_WarnMissingFiles) {
|
|
+ if(!project->isActiveConfig("static"))
|
|
+ warn_msg(WarnLogic, "Failure to find: %s", val.toLatin1().constData());
|
|
+ }
|
|
}
|
|
}
|
|
}
|