Skip to content

Commit 1f3777a

Browse files
authored
qt_minimal: enable feature in github runner not always in cargo (#1465)
1 parent 3b4f360 commit 1f3777a

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

.github/workflows/github-cxx-qt-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ jobs:
177177
#
178178
# NOTE: no compiler cache is needed as build is fast
179179
- name: "Build"
180-
run: cargo build --package qml-minimal-no-cmake
180+
run: cargo build --package qml-minimal-no-cmake --features qt_minimal
181181
- name: Test output files exist
182182
if: runner.os == 'Linux'
183183
run: |

examples/cargo_without_cmake/Cargo.toml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@ cxx-qt-lib = { workspace = true, features = ["full"] }
2121
# The link_qt_object_files feature is required for statically linking Qt 6.
2222
cxx-qt-build = { workspace = true, features = [ "link_qt_object_files" ] }
2323

24-
# Enable qt_minimal feature in qt-build-utils and optionally specify a qt-version
25-
# this allows for automatically downloading Qt when not found with qmake
26-
qt-build-utils = { workspace = true, features = ["qt_minimal"] }
24+
# Depend on qt-build-utils so that qt_minimal feature can be enabled
25+
qt-build-utils = { workspace = true }
26+
27+
[features]
28+
default = []
29+
30+
# Enable this feature to use qt_minimal downloads when QMAKE is not set
31+
qt_minimal = ["qt-build-utils/qt_minimal"]

0 commit comments

Comments
 (0)