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

Change-Id: Ia5d893e57deb78bc32e2053a5a79543ff847fe32

2 files changed, 21 insertions, 24 deletions

diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 650c0888c7..f295705e2e 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -95,7 +95,9 @@ QString NmakeMakefileGenerator::defaultInstall(const QString &t)
 
     if (project->isActiveConfig("debug_info")) {
         if (t == "dlltarget" || project->values(ProKey(t + ".CONFIG")).indexOf("no_dll") == -1) {
-            QString pdb_target = project->first("TARGET") + project->first("TARGET_VERSION_EXT") + ".pdb";
+            const QFileInfo targetFileInfo = project->first("DESTDIR") + project->first("TARGET")
+                    + project->first("TARGET_EXT");
+            const QString pdb_target = targetFileInfo.completeBaseName() + ".pdb";
             QString src_targ = (project->isEmpty("DESTDIR") ? QString("$(DESTDIR)") : project->first("DESTDIR")) + pdb_target;
             QString dst_targ = filePrefixRoot(root, fileFixify(targetdir + pdb_target, FileFixifyAbsolute));
             if(!ret.isEmpty())
@@ -252,15 +254,16 @@ void NmakeMakefileGenerator::init()
         project->values("PRECOMPILED_PCH_C")    = ProStringList(precompPchC);
     }
 
-    ProString tgt = project->first("DESTDIR")
-                    + project->first("TARGET") + project->first("TARGET_VERSION_EXT");
+    const QFileInfo targetFileInfo = project->first("DESTDIR") + project->first("TARGET")
+            + project->first("TARGET_EXT");
+    const ProString targetBase = targetFileInfo.path() + '/' + targetFileInfo.completeBaseName();
     if (project->first("TEMPLATE") == "lib" && project->isActiveConfig("shared")) {
-        project->values("QMAKE_CLEAN").append(tgt + ".exp");
-        project->values("QMAKE_DISTCLEAN").append(tgt + ".lib");
+        project->values("QMAKE_CLEAN").append(targetBase + ".exp");
+        project->values("QMAKE_DISTCLEAN").append(targetBase + ".lib");
     }
     if (project->isActiveConfig("debug_info")) {
         QString pdbfile;
-        QString distPdbFile = tgt + ".pdb";
+        QString distPdbFile = targetBase + ".pdb";
         if (project->isActiveConfig("staticlib")) {
             // For static libraries, the compiler's pdb file and the dist pdb file are the same.
             pdbfile = distPdbFile;
@@ -276,8 +279,8 @@ void NmakeMakefileGenerator::init()
         project->values("QMAKE_DISTCLEAN").append(distPdbFile);
     }
     if (project->isActiveConfig("debug")) {
-        project->values("QMAKE_CLEAN").append(tgt + ".ilk");
-        project->values("QMAKE_CLEAN").append(tgt + ".idb");
+        project->values("QMAKE_CLEAN").append(targetBase + ".ilk");
+        project->values("QMAKE_CLEAN").append(targetBase + ".idb");
     } else {
         ProStringList &defines = project->values("DEFINES");
         if (!defines.contains("NDEBUG"))
diff --git a/qmake/main.cpp b/qmake/main.cpp
index a4ef79227b..e5f7032554 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -260,31 +260,25 @@ static int installFile(const QString &source, const QString &target, bool exe =
         return 3;
     }
 
+    QFileDevice::Permissions targetPermissions = QFileDevice::ReadOwner | QFileDevice::WriteOwner
+            | QFileDevice::ReadUser | QFileDevice::WriteUser
+            | QFileDevice::ReadGroup | QFileDevice::ReadOther;
     if (exe) {
-        if (!targetFile.setPermissions(sourceFile.permissions() | QFileDevice::ExeOwner | QFileDevice::ExeUser |
-                                       QFileDevice::ExeGroup | QFileDevice::ExeOther)) {
-            fprintf(stderr, "Error setting execute permissions on %s: %s\n",
-                    qPrintable(target), qPrintable(targetFile.errorString()));
-            return 3;
-        }
+        targetPermissions |= QFileDevice::ExeOwner | QFileDevice::ExeUser |
+                QFileDevice::ExeGroup | QFileDevice::ExeOther;
+    }
+    if (!targetFile.setPermissions(targetPermissions)) {
+        fprintf(stderr, "Error setting permissions on %s: %s\n",
+                qPrintable(target), qPrintable(targetFile.errorString()));
+        return 3;
     }
 
     // Copy file times
     QString error;
-#ifdef Q_OS_WIN
-    const QFile::Permissions permissions = targetFile.permissions();
-    const bool readOnly = !(permissions & QFile::WriteUser);
-    if (readOnly)
-        targetFile.setPermissions(permissions | QFile::WriteUser);
-#endif
     if (!IoUtils::touchFile(target, sourceFile.fileName(), &error)) {
         fprintf(stderr, "%s", qPrintable(error));
         return 3;
     }
-#ifdef Q_OS_WIN
-    if (readOnly)
-        targetFile.setPermissions(permissions);
-#endif
     return 0;
 }