Skip to content

Commit

Permalink
(#15431) qt6: fix mingw debug lib names
Browse files Browse the repository at this point in the history
* [qt] fix: conanfile.py RuntimeError: OrderedDict mutated during iteration

* qt6: fix mingw debug lib names

fixes #15425
  • Loading branch information
ericLemanissier authored Jan 28, 2023
1 parent 997cb4f commit 8b66f2a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions recipes/qt/6.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ def _add_build_module(component, module):

libsuffix = ""
if self.settings.build_type == "Debug":
if self.settings.os == "Windows":
if is_msvc(self):
libsuffix = "d"
if is_apple_os(self):
libsuffix = "_debug"
Expand Down Expand Up @@ -1310,7 +1310,7 @@ def _create_plugin(pluginname, libname, type, requires):
_create_module("SerialPort")

if self.options.get_safe("qtserialbus"):
_create_module("SerialBus", ["SerialPort"])
_create_module("SerialBus", ["SerialPort"] if self.options.get_safe("qtserialport") else [])
_create_plugin("PassThruCanBusPlugin", "qtpassthrucanbus", "canbus", [])
_create_plugin("PeakCanBusPlugin", "qtpeakcanbus", "canbus", [])
_create_plugin("SocketCanBusPlugin", "qtsocketcanbus", "canbus", [])
Expand Down

0 comments on commit 8b66f2a

Please sign in to comment.