Make it possible to suppress the automatic version number in DLLs

qmake automatically appends the library's major version number to the DLL file name on Windows, as DLL naming doesn't include the version number on a suffix like on Unix systems. This flag makes it so qmake skips adding. This will allow us to insert Qt's major version number at a different position. Change-Id: I25d471038841fb0c5a34ef6b3bd6266aa33cebd1 Reviewed-by: Oswald Buddenhagen <[email protected]> (based on qtbase/565b6bd6354f9edd63e493aa41087550b4e08ae5)
wkhtmltopdf · May 24, 2018 · c4c1d4a · c4c1d4a
1 parent 21273ae
commit c4c1d4a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
@@ -25,7 +25,7 @@ breakpad {
     win32 {
         TARGET_BASEPATH ~= s,/,\\,
         contains(TEMPLATE, .*lib) {
-            isEmpty(TARGET_VERSION_EXT):!isEmpty(VERSION) {
+            !skip_target_version_ext:isEmpty(TARGET_VERSION_EXT):!isEmpty(VERSION) {
                 TARGET_VERSION_EXT = $$section(VERSION, ., 0, 0)
                 isEqual(TARGET_VERSION_EXT, 0):unset(TARGET_VERSION_EXT)
             }

diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
@@ -313,7 +313,8 @@ void Win32MakefileGenerator::processVars()
     }
 
     // TARGET_VERSION_EXT will be used to add a version number onto the target name
-    if (project->values("TARGET_VERSION_EXT").isEmpty()
+    if (!project->isActiveConfig("skip_target_version_ext")
+        && project->values("TARGET_VERSION_EXT").isEmpty()
         && !project->values("VER_MAJ").isEmpty()
         && project->values("QMAKE_SYMBIAN_SHLIB").isEmpty())
         project->values("TARGET_VERSION_EXT").append(project->values("VER_MAJ").first());