Fix a few more occurences of slixtyfps

This commit is contained in:
Olivier Goffart 2022-02-02 17:00:15 +01:00
parent cfda533b73
commit 7bf6c4826f
4 changed files with 5 additions and 5 deletions

View file

@ -7,12 +7,12 @@ The testing instructions are in the [testing.md](./testing.md) file.
### `helper_crates` ### `helper_crates`
A set of crates that are somehow not strictly related to sixtyfps, and that could be moved to A set of crates that are somehow not strictly related to Slint, and that could be moved to
their own repository and have their own version release at some point. their own repository and have their own version release at some point.
### `internal` ### `internal`
`internal` contains code that is not meant to be used directly by a user of sixtyfps. `internal` contains code that is not meant to be used directly by a user of Slint.
#### `compiler` #### `compiler`

View file

@ -86,7 +86,7 @@ Each program is compiled separately. And then run.
Some macro like `assert_eq` are defined to look similar o the rust equivalent. Some macro like `assert_eq` are defined to look similar o the rust equivalent.
To run the test, you must make sure to first build the slint shared library: To run the test, you must make sure to first build the slint-cpp shared library:
``` ```
cargo build --lib -p slint-cpp --features testing && cargo test -p test-driver-cpp -- cargo build --lib -p slint-cpp --features testing && cargo test -p test-driver-cpp --

View file

@ -47,7 +47,7 @@ window.check_if_pair_solved.setHandler(function () {
model.setRowData(tile2_index, tile2); model.setRowData(tile2_index, tile2);
} else { } else {
window.disable_tiles = true; window.disable_tiles = true;
sixtyfps.Timer.singleShot(1000, () => { slint.Timer.singleShot(1000, () => {
window.disable_tiles = false; window.disable_tiles = false;
tile1.image_visible = false; tile1.image_visible = false;
model.setRowData(tile1_index, tile1); model.setRowData(tile1_index, tile1);

View file

@ -64,7 +64,7 @@ fn generate_macro(
testcase: test_driver_lib::TestCase, testcase: test_driver_lib::TestCase,
) -> Result<bool, std::io::Error> { ) -> Result<bool, std::io::Error> {
if source.contains("\\{") { if source.contains("\\{") {
// Unfortunately, \{ is not valid in a rust string so it cannot be used in a sixtyfps! macro // Unfortunately, \{ is not valid in a rust string so it cannot be used in a slint! macro
output.write_all(b"#[test] #[ignore] fn ignored_because_string_template() {{}}")?; output.write_all(b"#[test] #[ignore] fn ignored_because_string_template() {{}}")?;
return Ok(false); return Ok(false);
} }