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

Jump to bottom

qt6: fix resources object files location #24150

Merged
merged 2 commits into from
May 30, 2024
Merged

qt6: fix resources object files location #24150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c4a335
qt: test: link with qtwidgets
ericLemanissier May 29, 2024
39b1484
fix resources path
ericLemanissier May 29, 2024
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
6 changes: 2 additions & 4 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 @@ -1539,10 +1539,8 @@ def _create_plugin(pluginname, libname, plugintype, requires):
component = "qt" + m[:m.find("_")]
if component not in self.cpp_info.components:
continue
submodules_dir = os.path.join(object_dir, m)
for sub_dir in os.listdir(submodules_dir):
submodule_dir = os.path.join(submodules_dir, sub_dir)
obj_files = [os.path.join(submodule_dir, file) for file in os.listdir(submodule_dir)]
for root, _, files in os.walk(os.path.join(object_dir, m)):
obj_files = [os.path.join(root, file) for file in files]
self.cpp_info.components[component].exelinkflags.extend(obj_files)
self.cpp_info.components[component].sharedlinkflags.extend(obj_files)

Expand Down
2 changes: 1 addition & 1 deletion recipes/qt/6.x.x/test_package/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ project(test_package LANGUAGES CXX)
find_package(Qt6 COMPONENTS Core Network Sql Concurrent Xml REQUIRED CONFIG)

add_executable(${PROJECT_NAME} WIN32 test_package.cpp greeter.h example.qrc)
target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Core Qt6::Network Qt6::Sql Qt6::Concurrent Qt6::Xml)
target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Core Qt6::Network Qt6::Sql Qt6::Concurrent Qt6::Xml Qt6::Widgets)
target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
set_target_properties(${PROJECT_NAME} PROPERTIES AUTOMOC ON AUTORCC ON)
Loading