Skip to content

Commit

Permalink
Fix qt6
Browse files Browse the repository at this point in the history
  • Loading branch information
fnadeau committed Nov 4, 2023
1 parent 46cf16f commit 54d709f
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion recipes/qt/6.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ def _minimum_compilers_version(self):
# Qt6 requires C++17
return {
"Visual Studio": "16",
"msvc": "192",
"gcc": "8",
"clang": "9",
"apple-clang": "12" if Version(self.version) >= "6.5.0" else "11"
Expand Down Expand Up @@ -1035,7 +1036,7 @@ def _create_plugin(pluginname, libname, plugintype, requires):

if self.settings.os == "Windows":
self.cpp_info.components["qtGui"].system_libs = ["advapi32", "gdi32", "ole32", "shell32", "user32", "d3d11",
"dxgi", "dxguid", "d2d1", "dwrite"]
"dxgi", "dxguid", "d2d1", "dwrite", "d3d9", "setupapi", "SHCore"]
if self.settings.compiler == "gcc":
self.cpp_info.components["qtGui"].system_libs.append("uuid")
_create_plugin("QWindowsIntegrationPlugin", "qwindows", "platforms", ["Core", "Gui"])
Expand Down Expand Up @@ -1147,6 +1148,8 @@ def _create_plugin(pluginname, libname, plugintype, requires):

if self.options.qtsvg and self.options.gui:
_create_module("Svg", ["Gui"])
_create_plugin("QSvgIconPlugin", "qsvgicon", "iconengines", [])
_create_plugin("QSvgPlugin", "qsvg", "imageformats", [])
if self.options.widgets:
_create_module("SvgWidgets", ["Gui", "Svg", "Widgets"])

Expand Down

0 comments on commit 54d709f

Please sign in to comment.