qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove build machine path that was baked into the qmake binary 

Remove the __FILE__ preprocessor macro that contains the full path to
the current source file. This is needed for reproducible builds.

The macro was only used for two debug messages. It's enough to mention
the file name - if at all.

Fixes: QTBUG-96281
Pick-to: 6.6 6.5
Change-Id: I7940ec090b570ec0105196a881e4c73c279bd248
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 7cc55822fb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Joerg Bornemann 2023-12-12 16:07:33 +01:00 committed by Qt Cherry-pick Bot
parent 76d47dce1b
commit cce1222cc0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qmake/generators/makefile.cpp
View File

@ -294,8 +294,8 @@ MakefileGenerator::findFilesInVPATH(ProStringList l, uchar flags, const QString
QStringList files = QDir(real_dir).entryList(QStringList(regex),
QDir::NoDotAndDotDot | QDir::AllEntries);
if(files.isEmpty()) {
debug_msg(1, "%s:%d Failure to find %s in vpath (%s)",
__FILE__, __LINE__, val.toLatin1().constData(),
debug_msg(1, "makefile.cpp:%d Failure to find %s in vpath (%s)",
__LINE__, val.toLatin1().constData(),
vpath.join(QString("::")).toLatin1().constData());
if (flags & VPATH_RemoveMissingFiles)
remove_file = true;
@ -312,8 +312,8 @@ MakefileGenerator::findFilesInVPATH(ProStringList l, uchar flags, const QString
}
}
} else {
debug_msg(1, "%s:%d Cannot match %s%s, as %s does not exist.",
__FILE__, __LINE__, real_dir.toLatin1().constData(),
debug_msg(1, "makefile.cpp:%d Cannot match %s%s, as %s does not exist.",
__LINE__, real_dir.toLatin1().constData(),
regex.toLatin1().constData(), real_dir.toLatin1().constData());
if (flags & VPATH_RemoveMissingFiles)
remove_file = true;