qt-build-utils: build system changes to have a QtInstallation #1230
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1230 +/- ##
=========================================
Coverage 100.00% 100.00%
=========================================
Files 73 73
Lines 12634 12634
=========================================
Hits 12634 12634 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
ahayzen-kdab
force-pushed
the
1125-build-system-changes-qtinstallation
branch
from
5f33455 to
8dcd7d5
Compare
ahayzen-kdab
force-pushed
the
1125-build-system-changes-qtinstallation
branch
6 times, most recently
from
634fb0d to
1ad252a
Compare
ahayzen-kdab
force-pushed
the
1125-build-system-changes-qtinstallation
branch
from
fefe5fc to
155f7a1
Compare
ahayzen-kdab
commented
Apr 23, 2025
ahayzen-kdab
commented
Apr 23, 2025
ahayzen-kdab
force-pushed
the
1125-build-system-changes-qtinstallation
branch
from
155f7a1 to
86a7f22
Compare
ahayzen-kdab
commented
Apr 24, 2025
Comment on lines
25
to
37
| /// TODO: should we hand in a cc::Build or should we instead return a struct | ||
| /// with details of the rustc-link-lib / search paths ? and then have the | ||
| /// calling function apply those and any flags to the cc::Build? | ||
| fn link_modules(&self, builder: &mut cc::Build, qt_modules: &[String]); |
There was a problem hiding this comment.
what do we think is the best interface here? Do we pass in a cc::Build and a list of Qt modules and the QtInstallation sets up the builder? Or should we just ask the QtInstallation with a list of Qt modules and it responds with a struct listing all the possible rustc-link options and any flags etc for cc::Build ?
ahayzen-kdab
force-pushed
the
1125-build-system-changes-qtinstallation
branch
from
86a7f22 to
cdaf205
Compare
This is just to test what we can do still with the old API
ahayzen-kdab
force-pushed
the
1125-build-system-changes-qtinstallation
branch
from
328cc00 to
01dc659
Compare
ahayzen-kdab
commented
May 1, 2025
| format!( | ||
| "{}/{}Qt{}{}.prl", | ||
| lib_path, prefix, version_major, qt_module | ||
| ) | ||
| } | ||
|
|
||
| /// Tell Cargo to link each Qt module. | ||
| pub fn cargo_link_libraries(&self, builder: &mut cc::Build) { |
There was a problem hiding this comment.
should probably rename to link_qt_modules or something
ahayzen-kdab
commented
May 1, 2025
| init_call: Some(format!("Q_INIT_RESOURCE({name});")), | ||
| init_declaration: Some(format!("#include <{init_header}>")), | ||
| } | ||
| pub fn qrc(&mut self, input_file: impl AsRef<Path>) -> Initializer { |
There was a problem hiding this comment.
need to remove these old usages and push everything through rcc()
ahayzen-kdab
commented
May 1, 2025
| } | ||
|
|
||
| /// Run moc on a C++ header file and save the output into [cargo's OUT_DIR](https://doc.rust-lang.org/cargo/reference/environment-variables.html). | ||
| /// The return value contains the path to the generated C++ file, which can then be passed to [cc::Build::files](https://docs.rs/cc/latest/cc/struct.Build.html#method.file), | ||
| /// as well as the path to the generated metatypes.json file, which can be passed to [register_qml_module](Self::register_qml_module). | ||
| /// | ||
| pub fn moc(&mut self, input_file: impl AsRef<Path>, arguments: MocArguments) -> MocProducts { |
There was a problem hiding this comment.
need to just return QtToolMoc
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is part of one of the steps towards #1125 and rewriting qt-build-utils.