diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py index 90c19d1762ee0..048abcf254579 100644 --- a/recipes/qt/5.x.x/conanfile.py +++ b/recipes/qt/5.x.x/conanfile.py @@ -1184,11 +1184,11 @@ def _create_plugin(pluginname, libname, plugintype, requires): cocoa_reqs.append("PrintSupport") _create_plugin("QCocoaIntegrationPlugin", "qcocoa", "platforms", cocoa_reqs) _create_plugin("QMacStylePlugin", "qmacstyle", "styles", cocoa_reqs) - self.cpp_info.components["QCocoaIntegrationPlugin"].frameworks = ["AppKit", "Carbon", "CoreServices", "CoreVideo", + self.cpp_info.components["qtQCocoaIntegrationPlugin"].frameworks = ["AppKit", "Carbon", "CoreServices", "CoreVideo", "IOKit", "IOSurface", "Metal", "QuartzCore"] elif self.settings.os in ["iOS", "tvOS"]: _create_plugin("QIOSIntegrationPlugin", "qios", "platforms", ["ClipboardSupport", "FontDatabaseSupport", "GraphicsSupport"]) - self.cpp_info.components["QIOSIntegrationPlugin"].frameworks = ["AudioToolbox", "Foundation", "Metal", + self.cpp_info.components["qtQIOSIntegrationPlugin"].frameworks = ["AudioToolbox", "Foundation", "Metal", "MobileCoreServices", "OpenGLES", "QuartzCore", "UIKit"] elif self.settings.os == "watchOS": _create_plugin("QMinimalIntegrationPlugin", "qminimal", "platforms", ["EventDispatcherSupport", "FontDatabaseSupport"]) @@ -1310,7 +1310,7 @@ def _create_plugin(pluginname, libname, plugintype, requires): "nss::nss", "libdrm::libdrm", "egl::egl"]) _create_module("WebEngineCore", webenginereqs) if self.settings.os != "Windows": - self.cpp_info.components["WebEngineCore"].system_libs.append("resolv") + self.cpp_info.components["qtWebEngineCore"].system_libs.append("resolv") _create_module("WebEngine", ["WebEngineCore"]) _create_module("WebEngineWidgets", ["WebEngineCore", "Quick", "PrintSupport", "Widgets", "Gui", "Network"]) diff --git a/recipes/qt/6.x.x/conanfile.py b/recipes/qt/6.x.x/conanfile.py index ea0b83fbef67f..7b8a2a3f1f6ed 100644 --- a/recipes/qt/6.x.x/conanfile.py +++ b/recipes/qt/6.x.x/conanfile.py @@ -1137,18 +1137,18 @@ def _create_plugin(pluginname, libname, plugintype, requires): self.cpp_info.components["qtGui"].frameworks += ["AppKit", "Carbon"] _create_plugin("QCocoaIntegrationPlugin", "qcocoa", "platforms", ["Core", "Gui"]) # /~https://github.com/qt/qtbase/blob/v6.6.1/src/plugins/platforms/cocoa/CMakeLists.txt#L51-L58 - self.cpp_info.components["QCocoaIntegrationPlugin"].frameworks = [ + self.cpp_info.components["qtQCocoaIntegrationPlugin"].frameworks = [ "AppKit", "Carbon", "CoreServices", "CoreVideo", "IOKit", "IOSurface", "Metal", "QuartzCore" ] elif self.settings.os in ["iOS", "tvOS"]: _create_plugin("QIOSIntegrationPlugin", "qios", "platforms", []) # /~https://github.com/qt/qtbase/blob/v6.6.1/src/plugins/platforms/ios/CMakeLists.txt#L32-L37 - self.cpp_info.components["QIOSIntegrationPlugin"].frameworks = [ + self.cpp_info.components["qtQIOSIntegrationPlugin"].frameworks = [ "AudioToolbox", "Foundation", "Metal", "QuartzCore", "UIKit", "CoreGraphics" ] if self.settings.os != "tvOS": # /~https://github.com/qt/qtbase/blob/v6.6.1/src/plugins/platforms/ios/CMakeLists.txt#L66-L68 - self.cpp_info.components["QIOSIntegrationPlugin"].frameworks += [ + self.cpp_info.components["qtQIOSIntegrationPlugin"].frameworks += [ "AssetsLibrary", "UniformTypeIdentifiers", "Photos", ] elif self.settings.os == "watchOS": @@ -1176,9 +1176,9 @@ def _create_plugin(pluginname, libname, plugintype, requires): if self.options.with_odbc: _create_plugin("QODBCDriverPlugin", "qsqlodbc", "sqldrivers", []) if self.settings.os != "Windows": - self.cpp_info.components["QODBCDriverPlugin"].requires.append("odbc::odbc") + self.cpp_info.components["qtQODBCDriverPlugin"].requires.append("odbc::odbc") else: - self.cpp_info.components["QODBCDriverPlugin"].system_libs.append("odbc32") + self.cpp_info.components["qtQODBCDriverPlugin"].system_libs.append("odbc32") networkReqs = [] if self.options.openssl: networkReqs.append("openssl::openssl")