Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qt6: fix QuickTest declaration #21263

Merged
merged 8 commits into from
Nov 21, 2023
Merged

qt6: fix QuickTest declaration #21263

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5b83511
qt6: fix cppstd
ericLemanissier Nov 10, 2023
524ef96
enable cross-compilation
ericLemanissier Nov 10, 2023
ad9825c
Update conanfile.py
ericLemanissier Nov 10, 2023
966ee64
re-disable cross compilation
ericLemanissier Nov 10, 2023
247d8e1
qt6: fix QuickTest declaration
ericLemanissier Nov 20, 2023
8cae62e
add all *Extras.cmake files to modules
ericLemanissier Nov 20, 2023
c361f8c
bump freetype
ericLemanissier Nov 20, 2023
cb1bf01
Merge branch 'qt6' into patch-1
ericLemanissier Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions recipes/qt/6.x.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ def requirements(self):
if self.options.with_doubleconversion and not self.options.multiconfiguration:
self.requires("double-conversion/3.3.0")
if self.options.get_safe("with_freetype", False) and not self.options.multiconfiguration:
self.requires("freetype/2.13.0")
self.requires("freetype/2.13.2")
if self.options.get_safe("with_fontconfig", False):
self.requires("fontconfig/2.14.2")
if self.options.get_safe("with_icu", False):
Expand Down Expand Up @@ -1120,8 +1120,8 @@ def _create_plugin(pluginname, libname, plugintype, requires):
if self.options.widgets:
_create_module("QuickWidgets", ["Gui", "Qml", "Quick", "Widgets"])
_create_module("QuickShapes", ["Gui", "Qml", "Quick"])
_create_module("QuickTest", ["Test", "Quick"])
_create_module("QmlWorkerScript", ["Qml"])
_create_module("QuickTest", ["Test"])

if self.options.qttools and self.options.gui and self.options.widgets:
self.cpp_info.components["qtLinguistTools"].set_property("cmake_target_name", "Qt6::LinguistTools")
Expand Down Expand Up @@ -1359,10 +1359,15 @@ def _create_plugin(pluginname, libname, plugintype, requires):
_add_build_module("qtCore", self._cmake_entry_point_file)

for m in os.listdir(os.path.join("lib", "cmake")):
module = os.path.join("lib", "cmake", m, f"{m}Macros.cmake")
component_name = m.replace("Qt6", "qt")
if component_name == "qt":
component_name = "qtCore"

module = os.path.join("lib", "cmake", m, f"{m}Macros.cmake")
if os.path.isfile(module):
_add_build_module(component_name, module)

module = os.path.join("lib", "cmake", m, f"{m}ConfigExtras.cmake")
if os.path.isfile(module):
_add_build_module(component_name, module)

Expand Down Expand Up @@ -1398,6 +1403,4 @@ def _add_build_modules_for_component(component):
for c in self.cpp_info.components:
_add_build_modules_for_component(c)

build_modules_list.append(os.path.join(self.package_folder, "lib", "cmake", "Qt6Core", "Qt6CoreConfigExtras.cmake"))

self.cpp_info.set_property("cmake_build_modules", build_modules_list)