1 files changed, 8 insertions, 2 deletions
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
index e51aa4766b..c24f2c6062 100644
--- a/mkspecs/features/qt_common.prf
+++ b/mkspecs/features/qt_common.prf
@@ -51,6 +51,12 @@ contains(TEMPLATE, .*lib) {
     }
     lib_replace.CONFIG = path
     QMAKE_PRL_INSTALL_REPLACE += lib_replace
+    !equals(qt_libdir, $$rplbase/lib) {
+        qtlibdir_replace.match = $$qt_libdir
+        qtlibdir_replace.replace = $$qqt_libdir
+        qtlibdir_replace.CONFIG = path
+        QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace
+    }
 }
 
 # The remainder of this file must not apply to host tools/libraries,
@@ -146,8 +152,8 @@ warnings_are_errors:warning_clean {
             android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix
         }
     } else:msvc:!intel_icl {
-        # enable for MSVC 2012, MSVC 2013, MSVC 2015
-        contains(MSVC_VER, "1[124].0"): QMAKE_CXXFLAGS_WARN_ON += -WX
+        # enable for MSVC 2015, MSVC 2017
+        contains(MSVC_VER, "1[45].0"): QMAKE_CXXFLAGS_WARN_ON += -WX
     }
     unset(ver)
 }