1 files changed, 6 insertions, 3 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index 8a60c44032..386e2865fa 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -100,10 +100,13 @@ ProString Win32MakefileGenerator::fixLibFlag(const ProString &lib)
 {
     if (lib.startsWith('/')) {
         if (lib.startsWith("/LIBPATH:"))
-            return QStringLiteral("/LIBPATH:") + escapeFilePath(lib.mid(9));
+            return QLatin1String("/LIBPATH:")
+                    + escapeFilePath(Option::fixPathToTargetOS(lib.mid(9).toQString(), false));
+        // This appears to be a user-supplied flag. Assume sufficient quoting.
         return lib;
     }
-    return escapeFilePath(lib);
+    // This must be a fully resolved library path.
+    return escapeFilePath(Option::fixPathToTargetOS(lib.toQString(), false));
 }
 
 bool
@@ -231,7 +234,7 @@ Win32MakefileGenerator::processPrlFiles()
             }
             ProStringList &prl_libs = project->values("QMAKE_CURRENT_PRL_LIBS");
             for (int prl = 0; prl < prl_libs.size(); ++prl)
-                l.insert(lit + prl + 1, prl_libs.at(prl));
+                l.insert(++lit, prl_libs.at(prl));
             prl_libs.clear();
         }