3 files changed, 27 insertions, 17 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 444556d467..b001fd930b 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -3110,15 +3110,18 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
 QString
 MakefileGenerator::pkgConfigFileName(bool fixify)
 {
-    QString ret = var("TARGET");
-    int slsh = ret.lastIndexOf(Option::dir_sep);
-    if(slsh != -1)
-        ret = ret.right(ret.length() - slsh - 1);
-    if(ret.startsWith("lib"))
-        ret = ret.mid(3);
-    int dot = ret.indexOf('.');
-    if(dot != -1)
-        ret = ret.left(dot);
+    QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
+    if (ret.isEmpty()) {
+        ret = project->first("TARGET").toQString();
+        int slsh = ret.lastIndexOf(Option::dir_sep);
+        if (slsh != -1)
+            ret = ret.right(ret.length() - slsh - 1);
+        if (ret.startsWith("lib"))
+            ret = ret.mid(3);
+        int dot = ret.indexOf('.');
+        if (dot != -1)
+            ret = ret.left(dot);
+    }
     ret += Option::pkgcfg_ext;
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index f7b0b29def..2a9e657304 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -311,7 +311,7 @@ VCCLCompilerTool::VCCLCompilerTool()
     :        AssemblerOutput(asmListingNone),
         BasicRuntimeChecks(runtimeBasicCheckNone),
         BrowseInformation(brInfoNone),
-        BufferSecurityCheck(_False),
+        BufferSecurityCheck(unset),
         CallingConvention(callConventionDefault),
         CompileAs(compileAsDefault),
         CompileAsManaged(managedDefault),
@@ -603,9 +603,7 @@ bool VCCLCompilerTool::parseOption(const char* option)
             CallingConvention = callConventionFastCall;
             break;
         case 's':
-            // Warning: following [num] is not used,
-            // were should we put it?
-            BufferSecurityCheck = _True;
+            AdditionalOptions += option;
             break;
         case 'y':
             EnableFunctionLevelLinking = _True;
@@ -1080,11 +1078,20 @@ bool VCCLCompilerTool::parseOption(const char* option)
         }
         found = false; break;
     case 'o':
-        if (second == 'p' && third == 'e' && fourth == 'n') {
-            OpenMP = _True;
-            break;
+    {
+        const char *str = option + 2;
+        const size_t len = strlen(str);
+        if (len >= 5 && len <= 6 && strncmp(str, "penmp", 5) == 0) {
+            if (len == 5) {
+                OpenMP = _True;
+                break;
+            } else if (str[5] == '-') {
+                OpenMP = _False;
+                break;
+            }
         }
         found = false; break;
+    }
     case 's':
         if(second == 'h' && third == 'o' && fourth == 'w') {
             ShowIncludes = _True;
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index 3831e08ed4..cac63ed932 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -834,7 +834,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
             if(slsh != -1)
                 dst_prl = dst_prl.right(dst_prl.length() - slsh - 1);
             dst_prl = filePrefixRoot(root, targetdir + dst_prl);
-            ret += "-$(INSTALL_FILE) \"" + project->first("QMAKE_INTERNAL_PRL_FILE") + "\" \"" + dst_prl + "\"";
+            ret += installMetaFile(ProKey("QMAKE_PRL_INSTALL_REPLACE"), project->first("QMAKE_INTERNAL_PRL_FILE").toQString(), dst_prl);
             if(!uninst.isEmpty())
                 uninst.append("\n\t");
             uninst.append("-$(DEL_FILE) \"" + dst_prl + "\"");