From 5597a497b5bb3b9fd569e45f88f45f2691419f06 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <dismine@gmail.com>
Date: Mon, 25 Mar 2024 13:59:58 +0200
Subject: [PATCH] Corect handling dynamic libraries on Windows with MSVC.

---
 qbs/module-providers/conan/provider.qbs | 29 +++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/qbs/module-providers/conan/provider.qbs b/qbs/module-providers/conan/provider.qbs
index 5af10ce82..fbf26f014 100644
--- a/qbs/module-providers/conan/provider.qbs
+++ b/qbs/module-providers/conan/provider.qbs
@@ -27,6 +27,7 @@ ModuleProvider {
 
             file.close();
 
+            var settings = fileContent.settings;
             var deps = fileContent.dependencies;
 
             for(i in deps){
@@ -69,8 +70,32 @@ ModuleProvider {
                 }
 
                 var cppLibraries = shared ? "\tcpp.dynamicLibraries: " : "\tcpp.staticLibraries: ";
-                var cppLibrariesTag = shared ? "dynamiclibrary" : "staticlibrary";
-                var cppLibrarySuffix = shared ? "cpp.dynamicLibrarySuffix" : "cpp.staticLibrarySuffix";
+
+                var cppLibrariesTag = "staticlibrary";
+                if (shared)
+                {
+                    if (settings["os"] == "Linux" || settings["os"] == "Macos")
+                    {
+                        cppLibrariesTag = "dynamiclibrary";
+                    }
+                    else
+                    {
+                        cppLibrariesTag = "dynamiclibrary_import";
+                    }
+                }
+
+                var cppLibrarySuffix = "cpp.staticLibrarySuffix";
+                if (shared)
+                {
+                    if (settings["os"] == "Linux" || settings["os"] == "Macos")
+                    {
+                        cppLibrarySuffix = "cpp.dynamicLibrarySuffix";
+                    }
+                    else
+                    {
+                        cppLibrarySuffix = "cpp.staticLibrarySuffix";
+                    }
+                }
 
                 moduleFile.write("import qbs\n" +
                                  "Module {\n" +