Merge remote-tracking branch 'origin/5.12' into dev

Change-Id: I91e684e74c36467efda8ded6ed19791baa0c1a1f

1 files changed, 4 insertions, 3 deletions

diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 306ae57871..780f6bd4d8 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -553,12 +553,13 @@ void NmakeMakefileGenerator::writeImplicitRulesPart(QTextStream &t)
             QDirIterator dit(sourceDir, sourceFilesFilter, QDir::Files | QDir::NoDotAndDotDot);
             while (dit.hasNext()) {
                 dit.next();
-                QString &duplicate = fileNames[dit.fileName()];
+                const QFileInfo fi = dit.fileInfo();
+                QString &duplicate = fileNames[fi.completeBaseName()];
                 if (duplicate.isNull()) {
-                    duplicate = dit.filePath();
+                    duplicate = fi.filePath();
                 } else {
                     warn_msg(WarnLogic, "%s conflicts with %s", qPrintable(duplicate),
-                             qPrintable(dit.filePath()));
+                             qPrintable(fi.filePath()));
                     duplicatesFound = true;
                 }
             }