From f2d7272df72972a2a22601b20484a9332f6ab1fe Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 12 Dec 2023 16:07:33 +0100 Subject: [PATCH] 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.5 Change-Id: I7940ec090b570ec0105196a881e4c73c279bd248 Reviewed-by: Alexandru Croitor (cherry picked from commit 7cc55822fb94dcbba4e686664ebfca233513b20e) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit cce1222cc0ff92875a6034ef128383ed7f9dabcc) --- qmake/generators/makefile.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 11d2f0ff7df..482ef2e2697 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -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;