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

 Conflicts:
	src/corelib/codecs/qicucodec.cpp
	src/dbus/qdbusserver.cpp
	src/gui/painting/qbezier.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
	src/plugins/printsupport/cups/qppdprintdevice.cpp

Change-Id: I2703128bb64baf5580fbc2c2061b55b0f0611d2a

4 files changed, 44 insertions, 24 deletions

diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp
index c43f6b4e4a..613c97fb85 100644
--- a/qmake/generators/projectgenerator.cpp
+++ b/qmake/generators/projectgenerator.cpp
@@ -36,7 +36,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QString project_builtin_regx() //calculate the builtin regular expression..
+static QString project_builtin_regx() //calculate the builtin regular expression..
 {
     QString ret;
     QStringList builtin_exts;
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index b6fe683d2c..8129bd76be 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -1568,21 +1568,12 @@ bool VCLinkerTool::parseOption(const char* option)
                 const char* str = option+6;
                 if (*str == 'S')
                     ShowProgress = linkProgressAll;
-#ifndef Q_OS_WIN
-                else if (strncasecmp(str, "pginstrument", 12))
+                else if (qstricmp(str, "pginstrument") == 0)
                     LinkTimeCodeGeneration = optLTCGInstrument;
-                else if (strncasecmp(str, "pgoptimize", 10))
+                else if (qstricmp(str, "pgoptimize") == 0)
                     LinkTimeCodeGeneration = optLTCGOptimize;
-                else if (strncasecmp(str, "pgupdate", 8 ))
+                else if (qstricmp(str, "pgupdate") == 0)
                     LinkTimeCodeGeneration = optLTCGUpdate;
-#else
-                else if (_stricmp(str, "pginstrument"))
-                    LinkTimeCodeGeneration = optLTCGInstrument;
-                else if (_stricmp(str, "pgoptimize"))
-                    LinkTimeCodeGeneration = optLTCGOptimize;
-                else if (_stricmp(str, "pgupdate"))
-                    LinkTimeCodeGeneration = optLTCGUpdate;
-#endif
             }
         } else {
             AdditionalOptions.append(option);
diff --git a/qmake/main.cpp b/qmake/main.cpp
index a598296898..dd1cca9633 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -242,6 +242,39 @@ static int doLink(int argc, char **argv)
 
 #endif
 
+static bool setFilePermissions(QFile &file, QFileDevice::Permissions permissions)
+{
+    if (file.setPermissions(permissions))
+        return true;
+    fprintf(stderr, "Error setting permissions on %s: %s\n",
+            qPrintable(file.fileName()), qPrintable(file.errorString()));
+    return false;
+}
+
+static bool copyFileTimes(QFile &targetFile, const QString &sourceFilePath,
+                          bool mustEnsureWritability, QString *errorString)
+{
+#ifdef Q_OS_WIN
+    bool mustRestorePermissions = false;
+    QFileDevice::Permissions targetPermissions;
+    if (mustEnsureWritability) {
+        targetPermissions = targetFile.permissions();
+        if (!targetPermissions.testFlag(QFileDevice::WriteUser)) {
+            mustRestorePermissions = true;
+            if (!setFilePermissions(targetFile, targetPermissions | QFileDevice::WriteUser))
+                return false;
+        }
+    }
+#endif
+    if (!IoUtils::touchFile(targetFile.fileName(), sourceFilePath, errorString))
+        return false;
+#ifdef Q_OS_WIN
+    if (mustRestorePermissions && !setFilePermissions(targetFile, targetPermissions))
+        return false;
+#endif
+    return true;
+}
+
 static int installFile(const QString &source, const QString &target, bool exe = false,
                        bool preservePermissions = false)
 {
@@ -270,18 +303,15 @@ static int installFile(const QString &source, const QString &target, bool exe =
         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()));
+    if (!setFilePermissions(targetFile, targetPermissions))
         return 3;
-    }
 
-    // Copy file times
     QString error;
-    if (!IoUtils::touchFile(target, sourceFile.fileName(), &error)) {
+    if (!copyFileTimes(targetFile, sourceFile.fileName(), preservePermissions, &error)) {
         fprintf(stderr, "%s", qPrintable(error));
         return 3;
     }
+
     return 0;
 }
 
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 1e31ecd6b7..d8143468e6 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -121,7 +121,6 @@ static QString detectProjectFile(const QString &path)
     return ret;
 }
 
-QString project_builtin_regx();
 bool usage(const char *a0)
 {
     fprintf(stdout, "Usage: %s [mode] [options] [files]\n"
@@ -133,9 +132,9 @@ bool usage(const char *a0)
             "\n"
             "Mode:\n"
             "  -project       Put qmake into project file generation mode%s\n"
-            "                 In this mode qmake interprets files as files to\n"
-            "                 be built,\n"
-            "                 defaults to %s\n"
+            "                 In this mode qmake interprets [files] as files to\n"
+            "                 be added to the .pro file. By default, all files with\n"
+            "                 known source extensions are added.\n"
             "                 Note: The created .pro file probably will \n"
             "                 need to be edited. For example add the QT variable to \n"
             "                 specify what modules are required.\n"
@@ -183,7 +182,7 @@ bool usage(const char *a0)
             "  -nomoc         Don't generate moc targets  [makefile mode only]\n"
             "  -nopwd         Don't look for files in pwd [project mode only]\n"
             ,a0,
-            default_mode(a0) == Option::QMAKE_GENERATE_PROJECT  ? " (default)" : "", project_builtin_regx().toLatin1().constData(),
+            default_mode(a0) == Option::QMAKE_GENERATE_PROJECT  ? " (default)" : "",
             default_mode(a0) == Option::QMAKE_GENERATE_MAKEFILE ? " (default)" : ""
         );
     return false;