From 17dd9941ececd1eba413f4df7a81afd8cf9e1825 Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Mon, 15 Apr 2024 14:14:38 +0200 Subject: [PATCH] change file name to LicenseRef-Slint-Royalty-free-1.2 --- .cargo/config.toml | 4 ++ .clang-format | 4 ++ .clippy.toml | 4 ++ .github/actions/codesign/action.yaml | 4 ++ .../install-linux-dependencies/action.yaml | 4 ++ .github/actions/install-nodejs/action.yaml | 4 ++ .github/actions/setup-rust/action.yaml | 4 ++ .../actions/test-online-editor/action.yaml | 4 ++ .github/workflows/build_docs.yaml | 4 ++ .github/workflows/ci.yaml | 4 ++ .github/workflows/cpp_package.yaml | 4 ++ .github/workflows/crater.yaml | 4 ++ .github/workflows/embedded_build.yaml | 4 ++ .github/workflows/nightly_snapshot.yaml | 4 ++ .github/workflows/publish_npm_package.yaml | 4 ++ .github/workflows/slint_tool_binary.yaml | 4 ++ .github/workflows/spellcheck.yaml | 4 ++ .github/workflows/torizon_demos.yaml | 4 ++ .github/workflows/translations.yaml | 4 ++ .github/workflows/tree_sitter.yaml | 4 ++ .github/workflows/upgrade_version.yaml | 4 ++ .../workflows/upload_esp_idf_component.yaml | 4 ++ .github/workflows/wasm_demos.yaml | 4 ++ .../wasm_editor_and_interpreter.yaml | 4 ++ .prettierrc | 4 ++ .reuse/dep5 | 32 +++++++++++++++ CHANGELOG.md | 4 ++ CMakeLists.txt | 4 ++ CONTRIBUTING.md | 4 ++ Cargo.toml | 8 ++++ FAQ.md | 4 ++ LICENSE.md | 8 ++++ LICENSES/LicenseRef-Slint-Royalty-free-1.2.md | 39 +++++++++++++++++++ README.md | 8 ++++ api/cpp/CMakeLists.txt | 4 ++ api/cpp/Cargo.toml | 4 ++ api/cpp/README.md | 4 ++ api/cpp/build.rs | 4 ++ api/cpp/cbindgen.rs | 4 ++ api/cpp/cmake/SlintConfig.cmake.in | 4 ++ api/cpp/cmake/SlintMacro.cmake | 4 ++ api/cpp/esp-idf/slint/CMakeLists.txt | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + api/cpp/esp-idf/slint/README.md | 4 ++ api/cpp/esp-idf/slint/idf_component.yml | 8 ++++ api/cpp/esp-idf/slint/include/slint-esp.h | 4 ++ api/cpp/esp-idf/slint/src/slint-esp.cpp | 4 ++ api/cpp/include/slint-interpreter.h | 4 ++ api/cpp/include/slint-platform.h | 4 ++ api/cpp/include/slint.h | 4 ++ api/cpp/include/slint_brush.h | 4 ++ api/cpp/include/slint_callbacks.h | 4 ++ api/cpp/include/slint_color.h | 4 ++ api/cpp/include/slint_config.h | 4 ++ api/cpp/include/slint_image.h | 4 ++ api/cpp/include/slint_interpreter.h | 4 ++ api/cpp/include/slint_pathdata.h | 4 ++ api/cpp/include/slint_point.h | 4 ++ api/cpp/include/slint_properties.h | 4 ++ api/cpp/include/slint_sharedvector.h | 4 ++ api/cpp/include/slint_size.h | 4 ++ api/cpp/include/slint_string.h | 4 ++ api/cpp/include/slint_testing.h | 4 ++ api/cpp/include/slint_timer.h | 4 ++ api/cpp/include/slint_window.h | 4 ++ api/cpp/include/vtable.h | 4 ++ api/cpp/lib.rs | 4 ++ api/cpp/platform.rs | 4 ++ api/cpp/tests/CMakeLists.txt | 4 ++ api/cpp/tests/datastructures.cpp | 4 ++ api/cpp/tests/eventloop.cpp | 4 ++ api/cpp/tests/interpreter.cpp | 4 ++ api/cpp/tests/models.cpp | 4 ++ .../tests/multiple-includes/CMakeLists.txt | 4 ++ api/cpp/tests/multiple-includes/README.md | 4 ++ .../tests/multiple-includes/appwindow.slint | 4 ++ api/cpp/tests/multiple-includes/logic.cpp | 4 ++ api/cpp/tests/multiple-includes/logic.h | 4 ++ api/cpp/tests/multiple-includes/main.cpp | 4 ++ api/cpp/tests/platform_eventloop.cpp | 4 ++ api/cpp/tests/properties.cpp | 4 ++ api/cpp/tests/test.slint | 4 ++ api/cpp/tests/window.cpp | 4 ++ api/node/.yarnrc.yml | 4 ++ api/node/Cargo.toml | 4 ++ api/node/README.md | 4 ++ api/node/__test__/api.spec.mts | 4 ++ api/node/__test__/compiler.spec.mts | 4 ++ api/node/__test__/eventloop.spec.mts | 4 ++ api/node/__test__/globals.spec.mts | 4 ++ .../__test__/js_value_conversion.spec.mts | 4 ++ api/node/__test__/resources/error.slint | 7 ++++ .../__test__/resources/test-constructor.slint | 7 ++++ api/node/__test__/resources/test.slint | 7 ++++ api/node/__test__/types.spec.mts | 4 ++ api/node/__test__/window.spec.mts | 4 ++ api/node/build-on-demand.mjs | 4 ++ api/node/build.rs | 4 ++ api/node/index.ts | 4 ++ api/node/src/interpreter.rs | 4 ++ .../src/interpreter/component_compiler.rs | 4 ++ .../src/interpreter/component_definition.rs | 4 ++ .../src/interpreter/component_instance.rs | 4 ++ api/node/src/interpreter/diagnostic.rs | 4 ++ api/node/src/interpreter/value.rs | 4 ++ api/node/src/interpreter/window.rs | 4 ++ api/node/src/lib.rs | 4 ++ api/node/src/types.rs | 4 ++ api/node/src/types/brush.rs | 4 ++ api/node/src/types/image_data.rs | 4 ++ api/node/src/types/model.rs | 4 ++ api/node/src/types/point.rs | 4 ++ api/node/src/types/size.rs | 4 ++ api/python/Cargo.toml | 4 ++ api/python/README.md | 4 ++ api/python/brush.rs | 4 ++ api/python/errors.rs | 4 ++ api/python/image.rs | 4 ++ api/python/interpreter.rs | 4 ++ api/python/lib.rs | 4 ++ api/python/models.rs | 4 ++ api/python/noxfile.py | 4 ++ api/python/pyproject.toml | 4 ++ api/python/slint/__init__.py | 4 ++ api/python/slint/models.py | 4 ++ api/python/tests/test_brush.py | 4 ++ api/python/tests/test_callback_decorators.py | 4 ++ api/python/tests/test_compiler.py | 4 ++ api/python/tests/test_gc.py | 4 ++ api/python/tests/test_import.py | 4 ++ api/python/tests/test_instance.py | 4 ++ api/python/tests/test_load_file.py | 4 ++ api/python/tests/test_load_file.slint | 4 ++ api/python/tests/test_models.py | 4 ++ api/python/tests/test_timers.py | 4 ++ api/python/timer.rs | 4 ++ api/python/value.rs | 4 ++ api/rs/build/Cargo.toml | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + api/rs/build/lib.rs | 4 ++ api/rs/macros/Cargo.toml | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + api/rs/macros/README.md | 4 ++ api/rs/macros/lib.rs | 4 ++ api/rs/slint/Cargo.toml | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + api/rs/slint/README.md | 4 ++ api/rs/slint/android.rs | 4 ++ api/rs/slint/compile_fail_tests.rs | 4 ++ api/rs/slint/docs.rs | 4 ++ api/rs/slint/lib.rs | 4 ++ api/rs/slint/private_unstable_api.rs | 4 ++ api/rs/slint/tests/partial_renderer.rs | 4 ++ api/rs/slint/tests/show_strongref.rs | 4 ++ api/rs/slint/tests/simple_macro.rs | 4 ++ api/rs/slint/tests/spawn_local.rs | 4 ++ api/wasm-interpreter/Cargo.toml | 4 ++ api/wasm-interpreter/src/lib.rs | 4 ++ cmake/FindOpenGLES2.cmake | 4 ++ cmake/FindOpenGLES3.cmake | 4 ++ docker/Dockerfile.aarch64-unknown-linux-gnu | 4 ++ .../Dockerfile.armv7-unknown-linux-gnueabihf | 4 ++ docker/Dockerfile.cpp-image | 4 ++ docker/Dockerfile.riscv64gc-unknown-linux-gnu | 4 ++ docker/Dockerfile.torizon-demos | 4 ++ docker/Dockerfile.x86_64-unknown-linux-gnu | 4 ++ editors/README.md | 4 ++ editors/sublime/Slint.sublime-syntax | 4 ++ editors/tree-sitter-slint/CONTRIBUTING.md | 4 ++ editors/tree-sitter-slint/README.md | 4 ++ editors/tree-sitter-slint/grammar.js | 4 ++ editors/tree-sitter-slint/test-to-corpus.py | 4 ++ editors/vscode/README.md | 4 ++ editors/vscode/esbuild.js | 4 ++ editors/vscode/src/browser-lsp-worker.ts | 4 ++ editors/vscode/src/browser.ts | 4 ++ editors/vscode/src/common.ts | 4 ++ editors/vscode/src/extension.ts | 4 ++ editors/vscode/src/propertiesView.ts | 4 ++ editors/vscode/src/properties_webview.ts | 4 ++ editors/vscode/src/wasm_preview.ts | 4 ++ .../welcome/show_preview.png.license | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + internal/backends/android-activity/Cargo.toml | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + internal/backends/android-activity/README.md | 4 ++ .../android-activity/androidwindowadapter.rs | 4 ++ internal/backends/android-activity/build.rs | 4 ++ .../java/SlintAndroidJavaHelper.java | 4 ++ .../backends/android-activity/javahelper.rs | 4 ++ internal/backends/android-activity/lib.rs | 4 ++ internal/backends/linuxkms/Cargo.toml | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + internal/backends/linuxkms/README.md | 4 ++ internal/backends/linuxkms/calloop_backend.rs | 4 ++ .../linuxkms/calloop_backend/input.rs | 4 ++ internal/backends/linuxkms/display.rs | 4 ++ .../backends/linuxkms/display/gbmdisplay.rs | 4 ++ .../backends/linuxkms/display/swdisplay.rs | 4 ++ .../linuxkms/display/vulkandisplay.rs | 4 ++ internal/backends/linuxkms/drmoutput.rs | 4 ++ .../linuxkms/fullscreenwindowadapter.rs | 4 ++ internal/backends/linuxkms/lib.rs | 4 ++ internal/backends/linuxkms/noop_backend.rs | 4 ++ .../backends/linuxkms/renderer/femtovg.rs | 4 ++ internal/backends/linuxkms/renderer/skia.rs | 4 ++ internal/backends/qt/Cargo.toml | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + internal/backends/qt/README.md | 4 ++ internal/backends/qt/accessible_generated.rs | 4 ++ internal/backends/qt/build.rs | 4 ++ internal/backends/qt/key_generated.rs | 4 ++ internal/backends/qt/lib.rs | 4 ++ internal/backends/qt/qt_accessible.rs | 4 ++ internal/backends/qt/qt_widgets.rs | 4 ++ internal/backends/qt/qt_widgets/button.rs | 4 ++ internal/backends/qt/qt_widgets/checkbox.rs | 4 ++ internal/backends/qt/qt_widgets/combobox.rs | 4 ++ internal/backends/qt/qt_widgets/groupbox.rs | 4 ++ internal/backends/qt/qt_widgets/lineedit.rs | 4 ++ .../backends/qt/qt_widgets/listviewitem.rs | 4 ++ internal/backends/qt/qt_widgets/palette.rs | 4 ++ .../qt/qt_widgets/progress_indicator.rs | 4 ++ internal/backends/qt/qt_widgets/scrollview.rs | 4 ++ internal/backends/qt/qt_widgets/slider.rs | 4 ++ internal/backends/qt/qt_widgets/spinbox.rs | 4 ++ .../backends/qt/qt_widgets/stylemetrics.rs | 4 ++ .../qt/qt_widgets/tableheadersection.rs | 4 ++ internal/backends/qt/qt_widgets/tabwidget.rs | 4 ++ internal/backends/qt/qt_window.rs | 4 ++ internal/backends/selector/Cargo.toml | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + internal/backends/selector/README.md | 4 ++ internal/backends/selector/build.rs | 4 ++ internal/backends/selector/lib.rs | 4 ++ internal/backends/testing/Cargo.toml | 4 ++ internal/backends/testing/README.md | 4 ++ internal/backends/testing/lib.rs | 4 ++ internal/backends/winit/Cargo.toml | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + internal/backends/winit/README.md | 4 ++ internal/backends/winit/accesskit.rs | 4 ++ internal/backends/winit/build.rs | 4 ++ internal/backends/winit/event_loop.rs | 4 ++ internal/backends/winit/lib.rs | 4 ++ internal/backends/winit/renderer/femtovg.rs | 4 ++ .../winit/renderer/femtovg/glcontext.rs | 4 ++ internal/backends/winit/renderer/skia.rs | 4 ++ internal/backends/winit/renderer/sw.rs | 4 ++ internal/backends/winit/wasm_input_helper.rs | 4 ++ internal/backends/winit/winitwindowadapter.rs | 4 ++ internal/common/Cargo.toml | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + internal/common/README.md | 4 ++ internal/common/builtin_structs.rs | 4 ++ internal/common/enums.rs | 4 ++ internal/common/key_codes.rs | 4 ++ internal/common/lib.rs | 4 ++ internal/common/sharedfontdb.rs | 4 ++ internal/common/sharedfontdb/fontconfig.rs | 4 ++ internal/compiler/Cargo.toml | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + internal/compiler/README.md | 4 ++ internal/compiler/build.rs | 4 ++ internal/compiler/builtin_macros.rs | 4 ++ internal/compiler/builtins.slint | 4 ++ internal/compiler/diagnostics.rs | 4 ++ internal/compiler/embedded_resources.rs | 4 ++ internal/compiler/expression_tree.rs | 4 ++ internal/compiler/fileaccess.rs | 4 ++ internal/compiler/generator.rs | 4 ++ internal/compiler/generator/cpp.rs | 4 ++ internal/compiler/generator/rust.rs | 4 ++ internal/compiler/langtype.rs | 4 ++ internal/compiler/layout.rs | 4 ++ internal/compiler/lexer.rs | 4 ++ internal/compiler/lib.rs | 4 ++ internal/compiler/literals.rs | 4 ++ internal/compiler/llr.rs | 4 ++ internal/compiler/llr/expression.rs | 4 ++ internal/compiler/llr/item_tree.rs | 4 ++ internal/compiler/llr/lower_expression.rs | 4 ++ internal/compiler/llr/lower_to_item_tree.rs | 4 ++ .../llr/optim_passes/count_property_use.rs | 4 ++ .../llr/optim_passes/inline_expressions.rs | 4 ++ internal/compiler/llr/pretty_print.rs | 4 ++ internal/compiler/load_builtins.rs | 4 ++ internal/compiler/lookup.rs | 4 ++ internal/compiler/namedreference.rs | 4 ++ internal/compiler/object_tree.rs | 4 ++ .../compiler/parser-test-macro/Cargo.toml | 4 ++ internal/compiler/parser-test-macro/README.md | 4 ++ internal/compiler/parser-test-macro/lib.rs | 4 ++ internal/compiler/parser.rs | 4 ++ internal/compiler/parser/document.rs | 4 ++ internal/compiler/parser/element.rs | 4 ++ internal/compiler/parser/expressions.rs | 4 ++ internal/compiler/parser/statements.rs | 4 ++ internal/compiler/parser/type.rs | 4 ++ internal/compiler/passes.rs | 4 ++ .../apply_default_properties_from_style.rs | 4 ++ internal/compiler/passes/binding_analysis.rs | 4 ++ internal/compiler/passes/border_radius.rs | 4 ++ internal/compiler/passes/check_expressions.rs | 4 ++ internal/compiler/passes/check_public_api.rs | 4 ++ internal/compiler/passes/check_rotation.rs | 4 ++ internal/compiler/passes/clip.rs | 4 ++ .../compiler/passes/collect_custom_fonts.rs | 4 ++ internal/compiler/passes/collect_globals.rs | 4 ++ internal/compiler/passes/collect_init_code.rs | 4 ++ .../passes/collect_structs_and_enums.rs | 4 ++ .../compiler/passes/collect_subcomponents.rs | 4 ++ internal/compiler/passes/compile_paths.rs | 4 ++ internal/compiler/passes/const_propagation.rs | 4 ++ .../passes/deduplicate_property_read.rs | 4 ++ internal/compiler/passes/default_geometry.rs | 4 ++ internal/compiler/passes/embed_glyphs.rs | 4 ++ internal/compiler/passes/embed_images.rs | 4 ++ internal/compiler/passes/ensure_window.rs | 4 ++ internal/compiler/passes/flickable.rs | 4 ++ internal/compiler/passes/focus_handling.rs | 4 ++ .../compiler/passes/generate_item_indices.rs | 4 ++ .../compiler/passes/infer_aliases_types.rs | 4 ++ internal/compiler/passes/inlining.rs | 4 ++ .../passes/lower_absolute_coordinates.rs | 4 ++ .../compiler/passes/lower_accessibility.rs | 4 ++ .../passes/lower_component_container.rs | 4 ++ internal/compiler/passes/lower_layout.rs | 4 ++ internal/compiler/passes/lower_popups.rs | 4 ++ .../passes/lower_property_to_element.rs | 4 ++ internal/compiler/passes/lower_shadows.rs | 4 ++ internal/compiler/passes/lower_states.rs | 4 ++ internal/compiler/passes/lower_tabwidget.rs | 4 ++ .../passes/lower_text_input_interface.rs | 4 ++ .../passes/materialize_fake_properties.rs | 4 ++ internal/compiler/passes/move_declarations.rs | 4 ++ .../passes/optimize_useless_rectangles.rs | 4 ++ internal/compiler/passes/purity_check.rs | 4 ++ internal/compiler/passes/remove_aliases.rs | 4 ++ internal/compiler/passes/remove_return.rs | 4 ++ .../passes/remove_unused_properties.rs | 4 ++ .../compiler/passes/repeater_component.rs | 4 ++ .../compiler/passes/resolve_native_classes.rs | 4 ++ internal/compiler/passes/resolving.rs | 4 ++ internal/compiler/passes/unique_id.rs | 4 ++ internal/compiler/passes/visible.rs | 4 ++ internal/compiler/passes/z_order.rs | 4 ++ internal/compiler/pathutils.rs | 4 ++ internal/compiler/tests/consistent_styles.rs | 4 ++ .../accessibility/accessible_properties.slint | 4 ++ .../tests/syntax/analysis/binding_loop1.slint | 4 ++ .../tests/syntax/analysis/binding_loop2.slint | 4 ++ .../analysis/binding_loop_function.slint | 4 ++ .../analysis/binding_loop_issue_772.slint | 4 ++ .../syntax/analysis/binding_loop_layout.slint | 4 ++ .../analysis/binding_loop_layout2.slint | 4 ++ .../analysis/binding_loop_layout3.slint | 4 ++ .../analysis/binding_loop_layout4.slint | 4 ++ .../binding_loop_mappointtowindow.slint | 4 ++ .../syntax/analysis/binding_loop_self.slint | 4 ++ .../compiler/tests/syntax/basic/animate.slint | 4 ++ .../compiler/tests/syntax/basic/array.slint | 4 ++ .../compiler/tests/syntax/basic/assign.slint | 4 ++ .../tests/syntax/basic/box_shadow.slint | 4 ++ .../syntax/basic/children_placeholder.slint | 4 ++ .../syntax/basic/children_placeholder_2.slint | 4 ++ .../compiler/tests/syntax/basic/clip.slint | 4 ++ .../tests/syntax/basic/comments.slint | 4 ++ .../compiler/tests/syntax/basic/dialog.slint | 4 ++ .../compiler/tests/syntax/basic/dialog2.slint | 4 ++ .../tests/syntax/basic/double_binding.slint | 4 ++ .../tests/syntax/basic/double_color.slint | 4 ++ .../tests/syntax/basic/duplicated_id.slint | 4 ++ .../compiler/tests/syntax/basic/easing.slint | 4 ++ .../syntax/basic/easing_not_called.slint | 4 ++ .../compiler/tests/syntax/basic/empty.slint | 4 ++ .../compiler/tests/syntax/basic/enums.slint | 4 ++ .../compiler/tests/syntax/basic/for.slint | 4 ++ .../compiler/tests/syntax/basic/image.slint | 4 ++ .../tests/syntax/basic/inline_component.slint | 4 ++ .../tests/syntax/basic/item_as_property.slint | 4 ++ .../compiler/tests/syntax/basic/layout.slint | 4 ++ .../compiler/tests/syntax/basic/layout2.slint | 4 ++ .../tests/syntax/basic/linear-gradient.slint | 4 ++ .../syntax/basic/object_in_binding.slint | 4 ++ .../compiler/tests/syntax/basic/opacity.slint | 4 ++ .../tests/syntax/basic/parse_error.slint | 4 ++ .../compiler/tests/syntax/basic/path.slint | 4 ++ .../tests/syntax/basic/path_commands.slint | 4 ++ .../tests/syntax/basic/path_for.slint | 4 ++ .../compiler/tests/syntax/basic/percent.slint | 4 ++ .../compiler/tests/syntax/basic/popup.slint | 4 ++ .../syntax/basic/property_animation.slint | 4 ++ .../syntax/basic/property_declaration.slint | 4 ++ .../property_declaration_in_component.slint | 4 ++ .../tests/syntax/basic/radial-gradient.slint | 4 ++ .../compiler/tests/syntax/basic/return.slint | 4 ++ .../tests/syntax/basic/rotation.slint | 4 ++ .../tests/syntax/basic/rust-attr.slint | 4 ++ .../tests/syntax/basic/self_assign.slint | 4 ++ .../compiler/tests/syntax/basic/signal.slint | 4 ++ .../syntax/basic/states_transitions.slint | 4 ++ .../syntax/basic/states_transitions2.slint | 4 ++ .../syntax/basic/states_transitions3.slint | 4 ++ .../tests/syntax/basic/states_two_way.slint | 4 ++ .../tests/syntax/basic/sub_elements.slint | 4 ++ .../tests/syntax/basic/supersimple.slint | 4 ++ .../tests/syntax/basic/svg_path.slint | 4 ++ internal/compiler/tests/syntax/basic/tr.slint | 4 ++ .../compiler/tests/syntax/basic/tr2.slint | 4 ++ .../tests/syntax/basic/type_declaration.slint | 4 ++ .../tests/syntax/basic/unknown_item.slint | 4 ++ .../tests/syntax/callbacks/init.slint | 4 ++ .../syntax/elements/component_container.slint | 4 ++ .../tests/syntax/elements/listview.slint | 4 ++ .../tests/syntax/elements/popup.slint | 4 ++ .../tests/syntax/elements/tabwidget.slint | 4 ++ .../tests/syntax/elements/tabwidget2.slint | 4 ++ .../tests/syntax/elements/tabwidget3.slint | 4 ++ .../syntax/exports/export_duplicates.slint | 4 ++ .../syntax/exports/reexport_duplicate.slint | 4 ++ .../syntax/exports/root_compo_export.slint | 4 ++ .../syntax/exports/root_compo_export2.slint | 4 ++ .../single_global_missing_export.slint | 4 ++ .../tests/syntax/exports/unused_compo.slint | 4 ++ .../syntax/expressions/arithmetic_op.slint | 4 ++ .../tests/syntax/expressions/clamp.slint | 4 ++ .../expressions/comparison_operator.slint | 4 ++ .../expressions/condition_operator.slint | 4 ++ .../tests/syntax/expressions/image-url.slint | 4 ++ .../tests/syntax/expressions/image-url2.slint | 4 ++ .../tests/syntax/expressions/minmax.slint | 4 ++ .../tests/syntax/expressions/percent2.slint | 4 ++ .../tests/syntax/expressions/strings.slint | 4 ++ .../tests/syntax/expressions/unary_op.slint | 4 ++ .../tests/syntax/focus/focus_invalid.slint | 4 ++ .../tests/syntax/focus/focus_not_called.slint | 4 ++ .../tests/syntax/focus/focus_wrong_args.slint | 4 ++ .../focus/initial_focus_non_input.slint | 4 ++ .../functions/function_double_qualified.slint | 4 ++ .../tests/syntax/functions/functions.slint | 4 ++ .../syntax/functions/functions_call.slint | 4 ++ .../syntax/functions/functions_purity.slint | 4 ++ .../tests/syntax/imports/bug_2719.slint | 4 ++ .../bug_3674_alias-from-broken-import.slint | 4 ++ .../tests/syntax/imports/cyclic_import.slint | 4 ++ .../syntax/imports/error_in_import.slint | 4 ++ .../syntax/imports/error_in_import2.slint | 4 ++ .../syntax/imports/error_in_import3.slint | 4 ++ .../compiler/tests/syntax/imports/font.slint | 4 ++ .../tests/syntax/imports/import_builtin.slint | 4 ++ .../tests/syntax/imports/import_error2.slint | 4 ++ .../tests/syntax/imports/import_errors.slint | 4 ++ .../syntax/imports/import_parse_error1.slint | 4 ++ .../syntax/imports/import_parse_error2.slint | 4 ++ .../syntax/imports/import_parse_error3.slint | 4 ++ .../syntax/imports/import_parse_error4.slint | 4 ++ .../syntax/imports/import_parse_error5.slint | 4 ++ .../tests/syntax/imports/invalid_export.slint | 4 ++ .../syntax/imports/visibility_errors.slint | 4 ++ .../tests/syntax/layout/if_in_grid.slint | 4 ++ .../tests/syntax/layout/if_in_grid_row.slint | 4 ++ .../syntax/layout/min_max_conflict.slint | 4 ++ .../tests/syntax/layout/spacing.slint | 4 ++ .../syntax/lookup/absolute-position.slint | 4 ++ .../tests/syntax/lookup/array_index.slint | 4 ++ .../tests/syntax/lookup/callback_alias.slint | 4 ++ .../tests/syntax/lookup/callback_alias2.slint | 4 ++ .../tests/syntax/lookup/callback_alias3.slint | 4 ++ .../lookup/callback_alias_issue4938.slint | 4 ++ .../syntax/lookup/callback_not_called.slint | 4 ++ .../tests/syntax/lookup/callback_return.slint | 4 ++ .../compiler/tests/syntax/lookup/color.slint | 4 ++ .../tests/syntax/lookup/conversion.slint | 4 ++ .../compiler/tests/syntax/lookup/dashes.slint | 4 ++ .../syntax/lookup/deprecated_property.slint | 4 ++ .../compiler/tests/syntax/lookup/enum.slint | 4 ++ .../tests/syntax/lookup/for_lookup.slint | 4 ++ .../compiler/tests/syntax/lookup/global.slint | 4 ++ .../compiler/tests/syntax/lookup/if.slint | 4 ++ .../tests/syntax/lookup/issue_1461.slint | 4 ++ .../tests/syntax/lookup/property.slint | 4 ++ .../syntax/lookup/recover_id_lookup.slint | 4 ++ .../tests/syntax/lookup/signal_arg.slint | 4 ++ .../tests/syntax/lookup/two_way_binding.slint | 4 ++ .../syntax/lookup/two_way_binding_infer.slint | 4 ++ .../syntax/lookup/two_way_binding_model.slint | 4 ++ .../syntax/new_syntax/deprecated_syntax.slint | 4 ++ .../syntax/new_syntax/input_output.slint | 4 ++ .../syntax/new_syntax/input_output2.slint | 4 ++ .../syntax/new_syntax/new_component.slint | 4 ++ .../tests/syntax/new_syntax/new_lookup.slint | 4 ++ .../new_syntax/two_way_input_output.slint | 4 ++ .../parse_error/children_placeholder0.slint | 4 ++ .../tests/syntax/parse_error/export0.slint | 4 ++ .../tests/syntax/parse_error/export1.slint | 4 ++ .../tests/syntax/parse_error/if0.slint | 4 ++ .../tests/syntax/parse_error/if1.slint | 4 ++ .../tests/syntax/parse_error/if2.slint | 4 ++ .../tests/syntax/parse_error/if3.slint | 4 ++ .../tests/syntax/parse_error/if4.slint | 4 ++ .../tests/syntax/parse_error/property1.slint | 4 ++ .../tests/syntax/parse_error/property2.slint | 4 ++ .../tests/syntax/parse_error/state1.slint | 4 ++ .../tests/syntax/parse_error/state2.slint | 4 ++ .../tests/syntax/parse_error/state3.slint | 4 ++ .../tests/syntax/parse_error/struct.slint | 4 ++ internal/compiler/tests/syntax_tests.rs | 4 ++ .../custom_style/TestStyle/std-widgets.slint | 4 ++ .../tests/typeloader/dependency_local.slint | 4 ++ .../typeloader/dependency_test_main.slint | 4 ++ .../typeloader/incpath/bug_2719_import.slint | 4 ++ .../bug_3674_alias_from_invalid_import.slint | 4 ++ .../incpath/dependency_from_incpath.slint | 4 ++ .../incpath/local_helper_type.slint | 4 ++ .../typeloader/incpath/should_fail.slint | 4 ++ .../typeloader/incpath/should_fail2.slint | 4 ++ .../typeloader/incpath/should_fail3.slint | 4 ++ .../typeloader/incpath/should_fail4.slint | 4 ++ .../library/dependency_from_library.slint | 4 ++ .../tests/typeloader/library/lib.slint | 4 ++ .../library/library_helper_type.slint | 4 ++ .../tests/typeloader/recursive_import1.slint | 4 ++ .../tests/typeloader/recursive_import2.slint | 4 ++ .../tests/typeloader/some_rust_file.rs | 4 ++ internal/compiler/typeloader.rs | 4 ++ internal/compiler/typeregister.rs | 4 ++ .../widgets/common/combobox-base.slint | 4 ++ internal/compiler/widgets/common/common.slint | 4 ++ .../widgets/common/lineedit-base.slint | 4 ++ .../compiler/widgets/common/listview.slint | 4 ++ .../compiler/widgets/common/slider-base.slint | 4 ++ .../widgets/common/spinbox-base.slint | 4 ++ .../widgets/common/spinner-base.slint | 4 ++ .../widgets/common/standardbutton.slint | 4 ++ .../widgets/common/tabwidget-base.slint | 2 +- .../compiler/widgets/cosmic-base/button.slint | 4 ++ .../widgets/cosmic-base/checkbox.slint | 4 ++ .../widgets/cosmic-base/combobox.slint | 4 ++ .../widgets/cosmic-base/components.slint | 4 ++ .../widgets/cosmic-base/groupbox.slint | 4 ++ .../widgets/cosmic-base/layouts.slint | 4 ++ .../widgets/cosmic-base/lineedit.slint | 4 ++ .../cosmic-base/progressindicator.slint | 4 ++ .../widgets/cosmic-base/scrollview.slint | 4 ++ .../compiler/widgets/cosmic-base/slider.slint | 4 ++ .../widgets/cosmic-base/spinbox.slint | 4 ++ .../widgets/cosmic-base/spinner.slint | 4 ++ .../cosmic-base/std-widgets-base.slint | 4 ++ .../cosmic-base/std-widgets-impl.slint | 4 ++ .../widgets/cosmic-base/styling.slint | 4 ++ .../compiler/widgets/cosmic-base/switch.slint | 4 ++ .../widgets/cosmic-base/tableview.slint | 4 ++ .../widgets/cosmic-base/tabwidget.slint | 4 ++ .../widgets/cosmic-base/textedit.slint | 4 ++ .../widgets/cosmic-dark/color-scheme.slint | 4 ++ .../cosmic-dark/std-widgets-impl.slint | 4 ++ .../widgets/cosmic-dark/std-widgets.slint | 4 ++ .../widgets/cosmic-light/color-scheme.slint | 4 ++ .../cosmic-light/std-widgets-impl.slint | 4 ++ .../widgets/cosmic-light/std-widgets.slint | 4 ++ .../widgets/cosmic/color-scheme.slint | 4 ++ .../widgets/cosmic/std-widgets-impl.slint | 4 ++ .../compiler/widgets/cosmic/std-widgets.slint | 4 ++ .../widgets/cupertino-base/button.slint | 4 ++ .../widgets/cupertino-base/checkbox.slint | 4 ++ .../widgets/cupertino-base/combobox.slint | 4 ++ .../widgets/cupertino-base/components.slint | 4 ++ .../widgets/cupertino-base/groupbox.slint | 4 ++ .../widgets/cupertino-base/layouts.slint | 4 ++ .../widgets/cupertino-base/lineedit.slint | 4 ++ .../cupertino-base/progressindicator.slint | 4 ++ .../widgets/cupertino-base/scrollview.slint | 4 ++ .../widgets/cupertino-base/slider.slint | 4 ++ .../widgets/cupertino-base/spinbox.slint | 4 ++ .../widgets/cupertino-base/spinner.slint | 4 ++ .../cupertino-base/std-widgets-base.slint | 4 ++ .../cupertino-base/std-widgets-impl.slint | 4 ++ .../widgets/cupertino-base/styling.slint | 4 ++ .../widgets/cupertino-base/switch.slint | 4 ++ .../widgets/cupertino-base/tableview.slint | 4 ++ .../widgets/cupertino-base/tabwidget.slint | 4 ++ .../widgets/cupertino-base/textedit.slint | 4 ++ .../widgets/cupertino-dark/color-scheme.slint | 4 ++ .../cupertino-dark/std-widgets-impl.slint | 4 ++ .../widgets/cupertino-dark/std-widgets.slint | 4 ++ .../cupertino-light/color-scheme.slint | 4 ++ .../cupertino-light/std-widgets-impl.slint | 4 ++ .../widgets/cupertino-light/std-widgets.slint | 4 ++ .../widgets/cupertino/color-scheme.slint | 4 ++ .../widgets/cupertino/std-widgets-impl.slint | 4 ++ .../widgets/cupertino/std-widgets.slint | 4 ++ .../compiler/widgets/fluent-base/button.slint | 4 ++ .../widgets/fluent-base/checkbox.slint | 4 ++ .../widgets/fluent-base/combobox.slint | 4 ++ .../widgets/fluent-base/components.slint | 4 ++ .../widgets/fluent-base/groupbox.slint | 4 ++ .../widgets/fluent-base/layouts.slint | 4 ++ .../widgets/fluent-base/lineedit.slint | 4 ++ .../fluent-base/progressindicator.slint | 4 ++ .../widgets/fluent-base/scrollview.slint | 4 ++ .../compiler/widgets/fluent-base/slider.slint | 4 ++ .../widgets/fluent-base/spinbox.slint | 4 ++ .../widgets/fluent-base/spinner.slint | 4 ++ .../fluent-base/std-widgets-base.slint | 4 ++ .../fluent-base/std-widgets-impl.slint | 4 ++ .../widgets/fluent-base/styling.slint | 4 ++ .../compiler/widgets/fluent-base/switch.slint | 4 ++ .../widgets/fluent-base/tableview.slint | 4 ++ .../widgets/fluent-base/tabwidget.slint | 4 ++ .../widgets/fluent-base/textedit.slint | 4 ++ .../widgets/fluent-dark/color-scheme.slint | 4 ++ .../fluent-dark/std-widgets-impl.slint | 4 ++ .../widgets/fluent-dark/std-widgets.slint | 4 ++ .../widgets/fluent-light/color-scheme.slint | 4 ++ .../fluent-light/std-widgets-impl.slint | 4 ++ .../widgets/fluent-light/std-widgets.slint | 4 ++ .../widgets/fluent/color-scheme.slint | 4 ++ .../widgets/fluent/std-widgets-impl.slint | 4 ++ .../compiler/widgets/fluent/std-widgets.slint | 4 ++ .../widgets/material-base/button.slint | 4 ++ .../widgets/material-base/checkbox.slint | 4 ++ .../widgets/material-base/combobox.slint | 4 ++ .../widgets/material-base/components.slint | 4 ++ .../widgets/material-base/groupbox.slint | 4 ++ .../widgets/material-base/layouts.slint | 4 ++ .../widgets/material-base/lineedit.slint | 4 ++ .../material-base/progressindicator.slint | 4 ++ .../widgets/material-base/scrollview.slint | 4 ++ .../widgets/material-base/slider.slint | 4 ++ .../widgets/material-base/spinbox.slint | 4 ++ .../widgets/material-base/spinner.slint | 4 ++ .../material-base/std-widgets-base.slint | 4 ++ .../material-base/std-widgets-impl.slint | 4 ++ .../widgets/material-base/styling.slint | 4 ++ .../widgets/material-base/switch.slint | 4 ++ .../widgets/material-base/tableview.slint | 4 ++ .../widgets/material-base/tabwidget.slint | 4 ++ .../widgets/material-dark/color-scheme.slint | 4 ++ .../material-dark/std-widgets-impl.slint | 4 ++ .../widgets/material-dark/std-widgets.slint | 4 ++ .../widgets/material-light/color-scheme.slint | 4 ++ .../material-light/std-widgets-impl.slint | 4 ++ .../widgets/material-light/std-widgets.slint | 4 ++ .../widgets/material/color-scheme.slint | 4 ++ .../widgets/material/std-widgets-impl.slint | 4 ++ .../widgets/material/std-widgets.slint | 4 ++ internal/compiler/widgets/qt/button.slint | 4 ++ internal/compiler/widgets/qt/checkbox.slint | 4 ++ internal/compiler/widgets/qt/combobox.slint | 4 ++ internal/compiler/widgets/qt/groupbox.slint | 4 ++ .../widgets/qt/internal-scrollview.slint | 4 ++ internal/compiler/widgets/qt/layouts.slint | 4 ++ internal/compiler/widgets/qt/lineedit.slint | 4 ++ .../widgets/qt/progressindicator.slint | 4 ++ internal/compiler/widgets/qt/scrollview.slint | 4 ++ internal/compiler/widgets/qt/slider.slint | 4 ++ internal/compiler/widgets/qt/spinbox.slint | 4 ++ internal/compiler/widgets/qt/spinner.slint | 4 ++ .../widgets/qt/std-widgets-impl.slint | 4 ++ .../compiler/widgets/qt/std-widgets.slint | 4 ++ internal/compiler/widgets/qt/switch.slint | 4 ++ internal/compiler/widgets/qt/tableview.slint | 4 ++ internal/compiler/widgets/qt/tabwidget.slint | 6 ++- internal/core-macros/Cargo.toml | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + internal/core-macros/README.md | 4 ++ internal/core-macros/lib.rs | 4 ++ internal/core/Cargo.toml | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + internal/core/README.md | 4 ++ internal/core/accessibility.rs | 4 ++ internal/core/animations.rs | 4 ++ internal/core/api.rs | 4 ++ internal/core/callbacks.rs | 4 ++ internal/core/component_factory.rs | 4 ++ internal/core/context.rs | 4 ++ internal/core/future.rs | 4 ++ internal/core/graphics.rs | 4 ++ internal/core/graphics/bitmapfont.rs | 4 ++ internal/core/graphics/border_radius.rs | 4 ++ internal/core/graphics/boxshadowcache.rs | 4 ++ internal/core/graphics/brush.rs | 4 ++ internal/core/graphics/color.rs | 4 ++ internal/core/graphics/image.rs | 4 ++ internal/core/graphics/image/cache.rs | 4 ++ internal/core/graphics/image/htmlimage.rs | 4 ++ internal/core/graphics/image/svg.rs | 4 ++ internal/core/graphics/path.rs | 4 ++ .../graphics/rendering_metrics_collector.rs | 4 ++ internal/core/input.rs | 4 ++ internal/core/item_focus.rs | 4 ++ internal/core/item_rendering.rs | 4 ++ internal/core/item_tree.rs | 4 ++ internal/core/items.rs | 4 ++ internal/core/items/component_container.rs | 4 ++ internal/core/items/flickable.rs | 4 ++ internal/core/items/image.rs | 4 ++ internal/core/items/path.rs | 4 ++ internal/core/items/text.rs | 4 ++ internal/core/layout.rs | 4 ++ internal/core/lengths.rs | 4 ++ internal/core/lib.rs | 4 ++ internal/core/model.rs | 4 ++ internal/core/model/adapters.rs | 4 ++ internal/core/model/model_peer.rs | 4 ++ internal/core/platform.rs | 4 ++ internal/core/properties.rs | 4 ++ internal/core/properties/ffi.rs | 4 ++ .../core/properties/properties_animations.rs | 4 ++ internal/core/renderer.rs | 4 ++ internal/core/rtti.rs | 4 ++ internal/core/sharedvector.rs | 4 ++ internal/core/slice.rs | 4 ++ internal/core/software_renderer.rs | 4 ++ .../core/software_renderer/draw_functions.rs | 4 ++ internal/core/software_renderer/fixed.rs | 4 ++ internal/core/software_renderer/fonts.rs | 4 ++ .../core/software_renderer/fonts/pixelfont.rs | 4 ++ .../software_renderer/fonts/systemfonts.rs | 4 ++ .../software_renderer/fonts/vectorfont.rs | 4 ++ internal/core/string.rs | 4 ++ internal/core/tests.rs | 4 ++ internal/core/textlayout.rs | 4 ++ internal/core/textlayout/fragments.rs | 4 ++ internal/core/textlayout/glyphclusters.rs | 4 ++ internal/core/textlayout/linebreak_simple.rs | 4 ++ internal/core/textlayout/linebreak_unicode.rs | 4 ++ internal/core/textlayout/linebreaker.rs | 4 ++ internal/core/textlayout/shaping.rs | 4 ++ internal/core/timers.rs | 4 ++ internal/core/translations.rs | 4 ++ internal/core/unsafe_single_threaded.rs | 4 ++ internal/core/window.rs | 4 ++ internal/interpreter/Cargo.toml | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + internal/interpreter/api.rs | 4 ++ internal/interpreter/dynamic_item_tree.rs | 4 ++ internal/interpreter/dynamic_type.rs | 4 ++ internal/interpreter/eval.rs | 4 ++ internal/interpreter/eval_layout.rs | 4 ++ internal/interpreter/ffi.rs | 4 ++ internal/interpreter/global_component.rs | 4 ++ internal/interpreter/highlight.rs | 4 ++ internal/interpreter/lib.rs | 4 ++ internal/interpreter/migration.rs | 4 ++ internal/interpreter/tests.rs | 4 ++ internal/interpreter/value_model.rs | 4 ++ internal/renderers/femtovg/Cargo.toml | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + internal/renderers/femtovg/README.md | 4 ++ internal/renderers/femtovg/fonts.rs | 4 ++ internal/renderers/femtovg/images.rs | 4 ++ internal/renderers/femtovg/itemrenderer.rs | 4 ++ internal/renderers/femtovg/lib.rs | 4 ++ internal/renderers/skia/Cargo.toml | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + internal/renderers/skia/README.md | 4 ++ internal/renderers/skia/build.rs | 4 ++ internal/renderers/skia/cached_image.rs | 4 ++ internal/renderers/skia/d3d_surface.rs | 4 ++ internal/renderers/skia/itemrenderer.rs | 4 ++ internal/renderers/skia/lib.rs | 4 ++ internal/renderers/skia/metal_surface.rs | 4 ++ internal/renderers/skia/opengl_surface.rs | 4 ++ internal/renderers/skia/software_surface.rs | 4 ++ internal/renderers/skia/textlayout.rs | 4 ++ internal/renderers/skia/vulkan_surface.rs | 4 ++ logo/README.md | 8 ++++ scripts/prepare_binary_package.sh | 4 ++ scripts/prepare_vscode_nightly.sh | 4 ++ scripts/publish.sh | 4 ++ tests/cases/absolute_coords.slint | 4 ++ tests/cases/accessibility/materialized.slint | 4 ++ .../bindings/animated_default_geometry.slint | 4 ++ .../cases/bindings/change_sub_property.slint | 4 ++ .../cases/bindings/change_sub_property2.slint | 4 ++ .../change_sub_property_indirection.slint | 4 ++ ...e_sub_property_indirection_issue2185.slint | 4 ++ .../bindings/issue_1026_opacity_alias.slint | 4 ++ .../issue_345_opacity_animation.slint | 4 ++ .../bindings/issue_385_default_geom.slint | 4 ++ tests/cases/bindings/multiple_two_way.slint | 4 ++ tests/cases/bindings/override.slint | 4 ++ tests/cases/bindings/two_way_binding.slint | 4 ++ tests/cases/bindings/two_way_binding2.slint | 4 ++ .../bindings/two_way_binding_animation.slint | 4 ++ .../bindings/two_way_binding_extra.slint | 4 ++ tests/cases/bindings/two_way_bug.slint | 4 ++ tests/cases/bindings/two_way_deep.slint | 4 ++ tests/cases/bindings/two_way_model.slint | 4 ++ tests/cases/bindings/two_way_priority.slint | 4 ++ .../bindings/two_way_priority_default.slint | 4 ++ tests/cases/bindings/two_way_simple.slint | 4 ++ tests/cases/callbacks/callback_alias.slint | 4 ++ .../callbacks/callback_name_conflicts.slint | 4 ++ tests/cases/callbacks/functions.slint | 4 ++ tests/cases/callbacks/handler.slint | 4 ++ tests/cases/callbacks/handler_with_arg.slint | 4 ++ tests/cases/callbacks/init.slint | 4 ++ .../callbacks/init_access_base_compo.slint | 4 ++ tests/cases/callbacks/init_layout.slint | 4 ++ tests/cases/callbacks/init_popup.slint | 4 ++ tests/cases/callbacks/return_value.slint | 4 ++ .../cases/children/children_placeholder.slint | 4 ++ .../children_placeholder_two_levels.slint | 4 ++ tests/cases/children/zorder.slint | 4 ++ tests/cases/conditional/cast.slint | 4 ++ tests/cases/conditional/expr.slint | 4 ++ tests/cases/conditional/stm.slint | 4 ++ tests/cases/conditional/stm2.slint | 4 ++ tests/cases/crashes/access_ellided_prop.slint | 4 ++ .../cases/crashes/access_moved_propdecl.slint | 4 ++ tests/cases/crashes/alias_in_if.slint | 4 ++ tests/cases/crashes/empty_listview.slint | 4 ++ .../crashes/issue1113_popup_in_repeater.slint | 4 ++ .../crashes/issue1267_opacity_in_layout.slint | 4 ++ tests/cases/crashes/issue1271_set_in_if.slint | 4 ++ .../issue1327_inlined_state_property.slint | 4 ++ .../crashes/issue1659_combobox_in_tab.slint | 4 ++ .../issue173_uninitialized_globals.slint | 4 ++ .../issue3589_layout_click_deletes_item.slint | 4 ++ .../crashes/issue_1009_const_alias.slint | 4 ++ .../issue_1233_listview_const_shadow.slint | 4 ++ .../issue_2274_const_state_crash.slint | 4 ++ .../crashes/issue_4002_width_alias.slint | 4 ++ .../issue_422_enclosing_component.slint | 4 ++ .../issue_983_listview_const_width.slint | 4 ++ tests/cases/crashes/layout_deleted_item.slint | 4 ++ .../crashes/layout_if_in_component.slint | 4 ++ .../crashes/link_two_way_geometry_if.slint | 4 ++ .../cases/crashes/optimized_item_shadow.slint | 4 ++ .../crashes/optimized_popup_parent.slint | 4 ++ tests/cases/crashes/shadow_fixed_width.slint | 4 ++ tests/cases/crashes/subsubcomponent.slint | 4 ++ tests/cases/crashes/subsubcomponent2.slint | 4 ++ .../cases/crashes/unused_callback_alias.slint | 4 ++ .../cases/elements/component_container.slint | 4 ++ .../component_container_component.slint | 4 ++ .../elements/component_container_init.slint | 4 ++ .../elements/component_container_size.slint | 4 ++ tests/cases/elements/dialog.slint | 4 ++ .../elements/element_ref_on_root_compo.slint | 4 ++ tests/cases/elements/flickable.slint | 4 ++ tests/cases/elements/flickable2.slint | 4 ++ tests/cases/elements/flickable3.slint | 4 ++ .../elements/flickable_in_flickable.slint | 4 ++ tests/cases/elements/image.slint | 4 ++ tests/cases/elements/image_geometry.slint | 4 ++ tests/cases/elements/listview.slint | 4 ++ .../cases/elements/listview_click_open.slint | 4 ++ tests/cases/elements/path.slint | 4 ++ tests/cases/elements/path_fit.slint | 4 ++ tests/cases/elements/popupwindow.slint | 4 ++ tests/cases/elements/popupwindow_close.slint | 4 ++ .../cases/elements/popupwindow_context.slint | 4 ++ tests/cases/elements/popupwindow_cursor.slint | 4 ++ tests/cases/elements/tabwidget.slint | 4 ++ tests/cases/elements/togglebutton.slint | 4 ++ tests/cases/elements/toucharea.slint | 4 ++ .../elements/toucharea_doubleclick.slint | 4 ++ tests/cases/examples/box_shadow_use.slint | 4 ++ tests/cases/examples/color.slint | 4 ++ tests/cases/examples/colored_image.slint | 4 ++ tests/cases/examples/hello.slint | 4 ++ tests/cases/examples/image_fit.slint | 4 ++ tests/cases/examples/image_rendering.slint | 4 ++ tests/cases/examples/key_press.slint | 4 ++ tests/cases/examples/layer.slint | 4 ++ tests/cases/examples/opacity.slint | 4 ++ tests/cases/examples/path_fill_rule.slint | 4 ++ tests/cases/examples/path_viewbox.slint | 4 ++ tests/cases/examples/plusminus.slint | 4 ++ tests/cases/examples/rectangle_clip.slint | 4 ++ tests/cases/examples/rotate.slint | 4 ++ tests/cases/examples/sample_component.slint | 4 ++ .../cases/examples/window_default_font.slint | 4 ++ tests/cases/exports/cpp_namespace.slint | 4 ++ tests/cases/exports/export_root.slint | 4 ++ tests/cases/exports/named_exports.slint | 4 ++ tests/cases/expr/abs.slint | 4 ++ tests/cases/expr/acos.slint | 4 ++ tests/cases/expr/animation_tick.slint | 4 ++ tests/cases/expr/arithmetic.slint | 4 ++ tests/cases/expr/asin.slint | 4 ++ tests/cases/expr/atan.slint | 4 ++ tests/cases/expr/ceil.slint | 4 ++ tests/cases/expr/clamp.slint | 4 ++ tests/cases/expr/comparison.slint | 4 ++ tests/cases/expr/cos.slint | 4 ++ tests/cases/expr/debug.slint | 4 ++ tests/cases/expr/floor.slint | 4 ++ tests/cases/expr/log.slint | 4 ++ tests/cases/expr/math.slint | 4 ++ tests/cases/expr/minmax.slint | 4 ++ tests/cases/expr/mod.slint | 4 ++ tests/cases/expr/pow.slint | 4 ++ tests/cases/expr/return.slint | 4 ++ tests/cases/expr/return2.slint | 4 ++ tests/cases/expr/round.slint | 4 ++ tests/cases/expr/sin.slint | 4 ++ tests/cases/expr/sqrt.slint | 4 ++ tests/cases/expr/string_concatenation.slint | 4 ++ tests/cases/expr/string_template.slint | 4 ++ tests/cases/expr/tan.slint | 4 ++ tests/cases/expr/tr.slint | 4 ++ tests/cases/expr/trigo.slint | 4 ++ tests/cases/focus/event_propagation.slint | 4 ++ tests/cases/focus/event_propagation_2.slint | 4 ++ tests/cases/focus/event_propagation_3.slint | 4 ++ tests/cases/focus/focus_change.slint | 4 ++ tests/cases/focus/focus_change_event.slint | 4 ++ tests/cases/focus/focus_change_subcompo.slint | 4 ++ .../focus/focus_change_through_signal.slint | 4 ++ tests/cases/focus/forward.slint | 4 ++ tests/cases/focus/initial_focus.slint | 4 ++ .../initial_focus_through_component.slint | 4 ++ .../focus/initial_focus_through_layout.slint | 4 ++ tests/cases/focus/keyboard_focus.slint | 4 ++ tests/cases/focus/keyboard_focus2.slint | 4 ++ tests/cases/focus/text-input-focused.slint | 4 ++ tests/cases/globals/alias_to_global.slint | 4 ++ tests/cases/globals/global_accessor_api.slint | 4 ++ tests/cases/globals/global_alias.slint | 4 ++ tests/cases/globals/global_binding.slint | 4 ++ .../cases/globals/global_binding_const.slint | 4 ++ tests/cases/globals/global_callback.slint | 4 ++ .../globals/global_depends_on_global.slint | 4 ++ .../issue_2064_two_way_default_value.slint | 4 ++ tests/cases/imports/duplicated_name.slint | 4 ++ tests/cases/imports/exported_component.slint | 4 ++ tests/cases/imports/external_globals.slint | 4 ++ .../imports/external_globals_nameclash.slint | 4 ++ tests/cases/imports/external_structs.slint | 4 ++ tests/cases/imports/external_type.slint | 4 ++ tests/cases/imports/import_multi.slint | 4 ++ tests/cases/imports/just_import.slint | 4 ++ tests/cases/imports/library.slint | 4 ++ tests/cases/imports/reexport.slint | 4 ++ tests/cases/input/clip_mouse.slint | 4 ++ tests/cases/input/scroll-event.slint | 4 ++ tests/cases/input/visible_mouse.slint | 4 ++ .../issue_1837_percent_comparison.slint | 4 ++ .../issues/issue_1846_visibility_in_for.slint | 4 ++ .../issues/issue_2483_access_spacing.slint | 4 ++ .../issue_2598_listview_reuse_elem.slint | 4 ++ .../issues/issue_2608_canon_img_path.slint | 4 ++ tests/cases/issues/issue_2717_has-hover.slint | 4 ++ .../issues/issue_2780_listview_crash.slint | 4 ++ .../issues/issue_3107_if_optimized_rect.slint | 4 ++ .../cases/issues/issue_3318_window_size.slint | 4 ++ .../issues/issue_3561_return_image.slint | 4 ++ .../issues/issue_4072_optimized_alias.slint | 4 ++ .../cases/issues/issue_4241_alias-const.slint | 4 ++ .../cases/issues/issue_4884_show_popup.slint | 4 ++ .../issues/issue_4942_no_else_value.slint | 4 ++ .../cases/issues/member_fun_from_parent.slint | 4 ++ tests/cases/issues/name_conflicts.slint | 4 ++ tests/cases/layout/box_alignment.slint | 4 ++ tests/cases/layout/box_precentages.slint | 4 ++ tests/cases/layout/box_preferred_size.slint | 4 ++ tests/cases/layout/default_fill.slint | 4 ++ tests/cases/layout/flickable_in_layout.slint | 4 ++ .../layout/geometry_center_by_default.slint | 4 ++ tests/cases/layout/grid.slint | 4 ++ tests/cases/layout/grid2.slint | 4 ++ tests/cases/layout/grid_fixed_size.slint | 4 ++ tests/cases/layout/grid_min_max.slint | 4 ++ tests/cases/layout/grid_padding.slint | 4 ++ tests/cases/layout/grid_preferred_size.slint | 4 ++ tests/cases/layout/grid_spacing.slint | 4 ++ tests/cases/layout/grid_span.slint | 4 ++ tests/cases/layout/grid_within_for.slint | 4 ++ tests/cases/layout/height_for_width.slint | 4 ++ tests/cases/layout/horizontal_for.slint | 4 ++ tests/cases/layout/horizontal_sizes.slint | 4 ++ ...ue_1057_listview_subcomponent_height.slint | 4 ++ .../layout/issue_1072_opacity_geometry.slint | 4 ++ tests/cases/layout/issue_140.slint | 4 ++ .../layout/issue_147_for_explicit_size.slint | 4 ++ .../issue_147_for_explicit_size_merge.slint | 4 ++ tests/cases/layout/issue_149_nested_for.slint | 4 ++ .../cases/layout/issue_160_box_min_max.slint | 4 ++ .../cases/layout/issue_167_if_relayout.slint | 4 ++ .../issue_2537_visible_in_listview.slint | 4 ++ .../issue_407_for_layout_in_flickable.slint | 4 ++ .../layout/issue_553_materialized_init.slint | 4 ++ .../issue_783_constraint_from_children.slint | 4 ++ tests/cases/layout/materialized_minmax.slint | 4 ++ tests/cases/layout/nested_boxes.slint | 4 ++ tests/cases/layout/nested_grid.slint | 4 ++ tests/cases/layout/nested_grid_2.slint | 4 ++ tests/cases/layout/nested_grid_minmax.slint | 4 ++ tests/cases/layout/opacity_in_layout.slint | 4 ++ tests/cases/layout/override_from_parent.slint | 4 ++ .../layout/special_default_geometry.slint | 4 ++ tests/cases/layout/text_no_wrap.slint | 4 ++ tests/cases/layout/text_preferred_size.slint | 4 ++ tests/cases/layout/vertical_if.slint | 4 ++ tests/cases/layout/window_fixed.slint | 4 ++ tests/cases/layout/window_preferred.slint | 4 ++ tests/cases/lookup/global_lookup.slint | 4 ++ tests/cases/lookup/id_lookup.slint | 4 ++ tests/cases/lookup/renamed_elements.slint | 4 ++ tests/cases/lookup/rust_names.slint | 4 ++ tests/cases/models/array.slint | 4 ++ tests/cases/models/assign_equal_model.slint | 4 ++ tests/cases/models/delete_from_clicked.slint | 4 ++ tests/cases/models/for.slint | 4 ++ tests/cases/models/if.slint | 4 ++ tests/cases/models/if_cond_property.slint | 4 ++ tests/cases/models/if_lookup.slint | 4 ++ .../issue_4961_model_index_property.slint | 4 ++ .../cases/models/listview_model_change.slint | 4 ++ tests/cases/models/model.slint | 4 ++ tests/cases/models/model_in_struct.slint | 4 ++ tests/cases/models/negative_intmodel.slint | 4 ++ tests/cases/models/scrolled_model.slint | 4 ++ tests/cases/models/write_to_model.slint | 4 ++ .../models/write_to_model_listview.slint | 4 ++ .../models/write_to_model_sub_component.slint | 4 ++ .../properties/animation_from_click.slint | 4 ++ ...nimation_from_click_in_repeated_4741.slint | 4 ++ .../cases/properties/animation_merging.slint | 4 ++ .../properties/animation_props_depends.slint | 4 ++ tests/cases/properties/border_radius.slint | 4 ++ tests/cases/properties/dashes.slint | 4 ++ .../properties/delayed_transitions.slint | 4 ++ .../properties/issue1237_states_visible.slint | 4 ++ .../properties/issue5038_state_in_base.slint | 2 +- .../cases/properties/property_animation.slint | 4 ++ .../property_animation_restart.slint | 4 ++ tests/cases/properties/states.slint | 4 ++ .../properties/states_with_animation.slint | 4 ++ tests/cases/properties/transitions.slint | 4 ++ tests/cases/properties/transitions2.slint | 4 ++ tests/cases/simple.slint | 4 ++ .../cases/subcomponents/nested_repeater.slint | 4 ++ tests/cases/subcomponents/no_children.slint | 4 ++ tests/cases/subcomponents/repeaters.slint | 4 ++ tests/cases/test_infrastructure.slint | 4 ++ tests/cases/text/control_keys_input.slint | 4 ++ tests/cases/text/cursor_move.slint | 4 ++ tests/cases/text/cursor_move_grapheme.slint | 4 ++ tests/cases/text/custom_font.slint | 4 ++ tests/cases/text/cut.slint | 4 ++ tests/cases/text/default_color.slint | 4 ++ tests/cases/text/input_type.slint | 4 ++ tests/cases/text/input_type_decimal.slint | 4 ++ tests/cases/text/input_type_number.slint | 4 ++ tests/cases/text/key_repeat.slint | 4 ++ tests/cases/text/keyboard_modifiers.slint | 4 ++ tests/cases/text/select_all.slint | 4 ++ tests/cases/text/select_double_click.slint | 4 ++ tests/cases/text/select_dribble_click.slint | 4 ++ tests/cases/text/surrogate_cursor.slint | 4 ++ tests/cases/text/text_change.slint | 4 ++ tests/cases/text/text_property_change.slint | 4 ++ tests/cases/text/textinput_functions.slint | 4 ++ tests/cases/text/undo_redo.slint | 4 ++ tests/cases/types/angles.slint | 4 ++ tests/cases/types/array.slint | 4 ++ tests/cases/types/array_of_array.slint | 4 ++ tests/cases/types/bool.slint | 4 ++ tests/cases/types/brush.slint | 4 ++ tests/cases/types/color.slint | 4 ++ tests/cases/types/cubic-bezier.slint | 4 ++ tests/cases/types/duration.slint | 4 ++ tests/cases/types/enum_compare.slint | 4 ++ tests/cases/types/enums.slint | 4 ++ tests/cases/types/functions.slint | 4 ++ tests/cases/types/gradients.slint | 4 ++ tests/cases/types/length.slint | 4 ++ tests/cases/types/nested_struct.slint | 4 ++ tests/cases/types/object.slint | 4 ++ tests/cases/types/percent.slint | 4 ++ tests/cases/types/relative_lengths.slint | 4 ++ tests/cases/types/rem.slint | 4 ++ tests/cases/types/resource.slint | 4 ++ tests/cases/types/string.slint | 4 ++ tests/cases/types/string_to_float.slint | 4 ++ tests/cases/types/structs.slint | 4 ++ tests/cases/types/structs2.slint | 4 ++ tests/cases/types/structs_keyword.slint | 4 ++ tests/cases/widgets/combobox.slint | 4 ++ tests/cases/widgets/listview.slint | 4 ++ tests/cases/widgets/slider_basic.slint | 4 ++ tests/cases/widgets/spinbox_basic.slint | 4 ++ tests/cases/widgets/tableview.slint | 4 ++ tests/doctests/Cargo.toml | 4 ++ tests/doctests/build.rs | 4 ++ tests/doctests/main.rs | 4 ++ tests/driver/cpp/Cargo.toml | 4 ++ tests/driver/cpp/build.rs | 4 ++ tests/driver/cpp/cppdriver.rs | 4 ++ tests/driver/cpp/main.rs | 4 ++ tests/driver/driverlib/Cargo.toml | 4 ++ tests/driver/driverlib/lib.rs | 4 ++ tests/driver/interpreter/Cargo.toml | 4 ++ tests/driver/interpreter/build.rs | 4 ++ tests/driver/interpreter/interpreter.rs | 4 ++ tests/driver/interpreter/main.rs | 4 ++ tests/driver/nodejs/Cargo.toml | 4 ++ tests/driver/nodejs/build.rs | 4 ++ tests/driver/nodejs/main.rs | 4 ++ tests/driver/nodejs/nodejs.rs | 4 ++ tests/driver/rust/Cargo.toml | 4 ++ tests/driver/rust/build.rs | 4 ++ tests/driver/rust/main.rs | 4 ++ tests/helper_components/export_globals.slint | 4 ++ tests/helper_components/export_structs.slint | 4 ++ tests/helper_components/main_window.slint | 4 ++ tests/helper_components/re_export.slint | 4 ++ tests/helper_components/re_export_all.slint | 4 ++ tests/helper_components/test_button.slint | 4 ++ tests/manual/opacity_inheritance.slint | 4 ++ tests/screenshots/Cargo.toml | 4 ++ tests/screenshots/build.rs | 4 ++ .../software/basic/border-image-repeat.slint | 4 ++ .../cases/software/basic/border-image.slint | 4 ++ .../cases/software/basic/border-image2.slint | 4 ++ .../cases/software/basic/border.slint | 4 ++ .../cases/software/basic/image-repeat.slint | 4 ++ .../software/basic/images-alignment.slint | 4 ++ .../software/basic/images-scale_factor.slint | 2 +- .../cases/software/basic/images.slint | 4 ++ .../software/basic/linear-gradients.slint | 4 ++ .../cases/software/basic/rgb.slint | 4 ++ .../basic/set-selection-offsets.slint | 4 ++ .../cases/software/basic/text-clipped.slint | 4 ++ .../cases/software/basic/text-elided.slint | 4 ++ .../software/basic/text-input-selection.slint | 4 ++ .../cases/software/basic/text-input.slint | 4 ++ .../cases/software/basic/text.slint | 4 ++ .../basic/translucent-background.slint | 4 ++ tests/screenshots/main.rs | 4 ++ tests/screenshots/testing.rs | 4 ++ tools/compiler/Cargo.toml | 4 ++ tools/compiler/main.rs | 4 ++ tools/figma_import/Cargo.toml | 8 ++++ tools/figma_import/README.md | 4 ++ tools/figma_import/src/figmatypes.rs | 4 ++ tools/figma_import/src/main.rs | 4 ++ tools/figma_import/src/rendered.rs | 4 ++ tools/lsp/Cargo.toml | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + tools/lsp/README.md | 4 ++ tools/lsp/build.rs | 4 ++ tools/lsp/common.rs | 4 ++ tools/lsp/fmt.rs | 4 ++ tools/lsp/fmt/README.md | 4 ++ tools/lsp/fmt/fmt.rs | 4 ++ tools/lsp/fmt/tool.rs | 4 ++ tools/lsp/fmt/writer.rs | 4 ++ tools/lsp/language.rs | 4 ++ tools/lsp/language/completion.rs | 4 ++ tools/lsp/language/component_catalog.rs | 4 ++ tools/lsp/language/formatting.rs | 4 ++ tools/lsp/language/goto.rs | 4 ++ tools/lsp/language/properties.rs | 4 ++ tools/lsp/language/semantic_tokens.rs | 4 ++ tools/lsp/language/test.rs | 4 ++ tools/lsp/lsp_ext.rs | 4 ++ tools/lsp/main.rs | 4 ++ tools/lsp/preview.rs | 4 ++ tools/lsp/preview/debug.rs | 4 ++ tools/lsp/preview/drop_location.rs | 4 ++ tools/lsp/preview/element_selection.rs | 4 ++ tools/lsp/preview/ext.rs | 4 ++ tools/lsp/preview/native.rs | 4 ++ tools/lsp/preview/ui.rs | 4 ++ tools/lsp/preview/wasm.rs | 4 ++ tools/lsp/ui/component-list.slint | 4 ++ tools/lsp/ui/diagnostics-overlay.slint | 4 ++ tools/lsp/ui/draw-area.slint | 4 ++ tools/lsp/ui/header-bar.slint | 4 ++ tools/lsp/ui/main.slint | 4 ++ tools/lsp/ui/resizer.slint | 4 ++ tools/lsp/util.rs | 4 ++ tools/lsp/wasm_main.rs | 4 ++ tools/slintpad/README.md | 4 ++ tools/slintpad/cypress.config.ts | 4 ++ tools/slintpad/cypress/e2e/smoke_test.cy.ts | 4 ++ tools/slintpad/cypress/plugins/index.ts | 4 ++ tools/slintpad/cypress/support/commands.ts | 4 ++ tools/slintpad/cypress/support/e2e.ts | 4 ++ tools/slintpad/src/dialogs.ts | 4 ++ tools/slintpad/src/editor_widget.ts | 4 ++ tools/slintpad/src/github.ts | 4 ++ tools/slintpad/src/highlighting.ts | 4 ++ tools/slintpad/src/index.ts | 4 ++ tools/slintpad/src/lsp.ts | 4 ++ tools/slintpad/src/lsp_integration.ts | 4 ++ tools/slintpad/src/outline_widget.ts | 4 ++ tools/slintpad/src/preview.ts | 4 ++ tools/slintpad/src/preview_widget.ts | 4 ++ tools/slintpad/src/properties_widget.ts | 4 ++ tools/slintpad/src/proxy.ts | 4 ++ tools/slintpad/src/shared/lsp_commands.ts | 4 ++ tools/slintpad/src/shared/properties.ts | 4 ++ tools/slintpad/src/text.ts | 4 ++ tools/slintpad/src/types.ts | 4 ++ tools/slintpad/src/welcome_widget.ts | 4 ++ tools/slintpad/src/worker/lsp_worker.ts | 4 ++ tools/slintpad/src/worker/monaco_worker.mjs | 4 ++ tools/slintpad/src/worker/types.ts | 4 ++ tools/slintpad/vite.config.ts | 4 ++ tools/tr-extractor/Cargo.toml | 4 ++ tools/tr-extractor/README.md | 4 ++ tools/tr-extractor/main.rs | 4 ++ tools/updater/Cargo.toml | 4 ++ tools/updater/README.md | 4 ++ tools/updater/experiments/geometry_changes.rs | 4 ++ .../experiments/input_output_properties.rs | 4 ++ tools/updater/experiments/lookup_changes.rs | 4 ++ .../experiments/new_component_declaration.rs | 4 ++ tools/updater/experiments/purity.rs | 4 ++ tools/updater/experiments/transitions.rs | 4 ++ tools/updater/main.rs | 4 ++ tools/updater/transforms/renames.rs | 4 ++ tools/viewer/Cargo.toml | 4 ++ .../LicenseRef-Slint-Royalty-free-1.2.md | 1 + tools/viewer/README.md | 4 ++ tools/viewer/main.rs | 4 ++ xtask/Cargo.toml | 4 ++ xtask/src/cppdocs.rs | 4 ++ xtask/src/license_headers_check.rs | 12 ++++++ xtask/src/main.rs | 4 ++ xtask/src/nodepackage.rs | 4 ++ xtask/src/reuse_compliance_check.rs | 4 ++ xtask/src/slintdocs.rs | 4 ++ 1231 files changed, 4963 insertions(+), 4 deletions(-) create mode 100644 LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 api/cpp/esp-idf/slint/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 api/rs/build/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 api/rs/macros/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 api/rs/slint/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 examples/mcu-board-support/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 internal/backends/android-activity/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 internal/backends/linuxkms/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 internal/backends/qt/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 internal/backends/selector/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 internal/backends/winit/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 internal/common/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 internal/compiler/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 internal/core-macros/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 internal/core/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 internal/interpreter/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 internal/renderers/femtovg/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 internal/renderers/skia/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 tools/lsp/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md create mode 120000 tools/viewer/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md diff --git a/.cargo/config.toml b/.cargo/config.toml index c5f3aec0c60..1d131a198f8 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [alias] xtask = "run --package xtask --" diff --git a/.clang-format b/.clang-format index b756eeef524..3fce43b2ea9 100644 --- a/.clang-format +++ b/.clang-format @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 --- # Webkit style was loosely based on the Qt style diff --git a/.clippy.toml b/.clippy.toml index 9c442578de7..9dee7fe3162 100644 --- a/.clippy.toml +++ b/.clippy.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 type-complexity-threshold = 2500 too-many-arguments-threshold = 10 diff --git a/.github/actions/codesign/action.yaml b/.github/actions/codesign/action.yaml index faa4c76ffb6..a16f7ec8d59 100644 --- a/.github/actions/codesign/action.yaml +++ b/.github/actions/codesign/action.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 --- name: Apple Codesign Binary diff --git a/.github/actions/install-linux-dependencies/action.yaml b/.github/actions/install-linux-dependencies/action.yaml index 817eb33f0d6..10deb9e00db 100644 --- a/.github/actions/install-linux-dependencies/action.yaml +++ b/.github/actions/install-linux-dependencies/action.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # cSpell: ignore libxcb libxkbcommon xfixes --- diff --git a/.github/actions/install-nodejs/action.yaml b/.github/actions/install-nodejs/action.yaml index f7de9a59c12..4846fb30799 100644 --- a/.github/actions/install-nodejs/action.yaml +++ b/.github/actions/install-nodejs/action.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 --- name: Install NodeJS diff --git a/.github/actions/setup-rust/action.yaml b/.github/actions/setup-rust/action.yaml index cf2100f5811..62a01ea35bb 100644 --- a/.github/actions/setup-rust/action.yaml +++ b/.github/actions/setup-rust/action.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # cSpell: ignore debuginfo rustflags swatinem diff --git a/.github/actions/test-online-editor/action.yaml b/.github/actions/test-online-editor/action.yaml index a665d9c6128..2a5786eeeae 100644 --- a/.github/actions/test-online-editor/action.yaml +++ b/.github/actions/test-online-editor/action.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # cSpell: ignore vite diff --git a/.github/workflows/build_docs.yaml b/.github/workflows/build_docs.yaml index 60c6722a6c8..ddc274b50a4 100644 --- a/.github/workflows/build_docs.yaml +++ b/.github/workflows/build_docs.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Build various demo binaries, c++ packages and documentation and publish them on the website name: Build docs diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 69a1d12640b..a9fd5877058 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 name: CI diff --git a/.github/workflows/cpp_package.yaml b/.github/workflows/cpp_package.yaml index ade700f2f14..3d77cb12fb1 100644 --- a/.github/workflows/cpp_package.yaml +++ b/.github/workflows/cpp_package.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 name: Build the C++ binary package diff --git a/.github/workflows/crater.yaml b/.github/workflows/crater.yaml index ae3bb336f1c..6672329d323 100644 --- a/.github/workflows/crater.yaml +++ b/.github/workflows/crater.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # This workflow checks out and build a bunch of crates that uses Slint, # with the current branch diff --git a/.github/workflows/embedded_build.yaml b/.github/workflows/embedded_build.yaml index fa552d984d1..125621ac427 100644 --- a/.github/workflows/embedded_build.yaml +++ b/.github/workflows/embedded_build.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 name: Embedded Build diff --git a/.github/workflows/nightly_snapshot.yaml b/.github/workflows/nightly_snapshot.yaml index 3ac43ea54be..1a2b2895a16 100644 --- a/.github/workflows/nightly_snapshot.yaml +++ b/.github/workflows/nightly_snapshot.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Build various demo binaries, c++ packages and documentation and publish them on the website name: Nightly snapshot diff --git a/.github/workflows/publish_npm_package.yaml b/.github/workflows/publish_npm_package.yaml index c406067903a..bcf77a3efd2 100644 --- a/.github/workflows/publish_npm_package.yaml +++ b/.github/workflows/publish_npm_package.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 name: Publish npm package to npm registry diff --git a/.github/workflows/slint_tool_binary.yaml b/.github/workflows/slint_tool_binary.yaml index cc1dc51663b..ddde4174b4d 100644 --- a/.github/workflows/slint_tool_binary.yaml +++ b/.github/workflows/slint_tool_binary.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 name: Build slint-viewer or -lsp binary diff --git a/.github/workflows/spellcheck.yaml b/.github/workflows/spellcheck.yaml index 097a52f6749..fec2bec7045 100644 --- a/.github/workflows/spellcheck.yaml +++ b/.github/workflows/spellcheck.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 name: "Check spelling" on: diff --git a/.github/workflows/torizon_demos.yaml b/.github/workflows/torizon_demos.yaml index 78e09beccca..7b42d3b74bf 100644 --- a/.github/workflows/torizon_demos.yaml +++ b/.github/workflows/torizon_demos.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 name: Rust Demos built for Torizon diff --git a/.github/workflows/translations.yaml b/.github/workflows/translations.yaml index e7a4355af28..d6123db67a2 100644 --- a/.github/workflows/translations.yaml +++ b/.github/workflows/translations.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Run slint-tr-extractor and msgfmt name: Update Translations diff --git a/.github/workflows/tree_sitter.yaml b/.github/workflows/tree_sitter.yaml index b0235aa85c9..9f433f04621 100644 --- a/.github/workflows/tree_sitter.yaml +++ b/.github/workflows/tree_sitter.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 name: "Tree Sitter Test" on: diff --git a/.github/workflows/upgrade_version.yaml b/.github/workflows/upgrade_version.yaml index e5a6b025514..4a6ae3beaab 100644 --- a/.github/workflows/upgrade_version.yaml +++ b/.github/workflows/upgrade_version.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 name: Upgrade Version Number diff --git a/.github/workflows/upload_esp_idf_component.yaml b/.github/workflows/upload_esp_idf_component.yaml index 0d5a836f3af..a798116890e 100644 --- a/.github/workflows/upload_esp_idf_component.yaml +++ b/.github/workflows/upload_esp_idf_component.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 name: Upload component to ESP-IDF component registry diff --git a/.github/workflows/wasm_demos.yaml b/.github/workflows/wasm_demos.yaml index 46fd49226a4..84631a0f7ff 100644 --- a/.github/workflows/wasm_demos.yaml +++ b/.github/workflows/wasm_demos.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 name: Build wasm demos diff --git a/.github/workflows/wasm_editor_and_interpreter.yaml b/.github/workflows/wasm_editor_and_interpreter.yaml index d625e8e8ffe..60011699540 100644 --- a/.github/workflows/wasm_editor_and_interpreter.yaml +++ b/.github/workflows/wasm_editor_and_interpreter.yaml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 --- name: Build and test the slintpad and required WASM binaries diff --git a/.prettierrc b/.prettierrc index 52fca3ec41f..a04853caced 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,4 +1,8 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 tabWidth: 4 diff --git a/.reuse/dep5 b/.reuse/dep5 index 5f619502c73..836241b0fe1 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -9,7 +9,11 @@ License: CC-BY-ND-4.0 Files: .gitattributes .gitignore */.gitignore .dockerignore .prettierignore .pre-commit-config.yaml .vscode/* cspell.json rustfmt.toml .mailmap */.eslintrc.yml Cargo.lock */.npmignore Copyright: Copyright © SixtyFPS GmbH +<<<<<<< HEAD +License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Files: api/cpp/docs/*/*.html api/cpp/docs/*/*.css docs/*/*.css docs/*/*.html docs/*/book.toml docs/*/package.json Copyright: Copyright © SixtyFPS GmbH @@ -26,11 +30,19 @@ License: MIT Files: api/*/*.json Copyright: Copyright © SixtyFPS GmbH +<<<<<<< HEAD +License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial + +Files: examples/*.json examples/*/README examples/*/README.txt examples/cpp/qt_viewer/interface.ui +Copyright: Copyright © SixtyFPS GmbH +License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial Files: examples/*.json examples/*/README examples/*/README.txt examples/cpp/qt_viewer/interface.ui Copyright: Copyright © SixtyFPS GmbH License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Files: examples/memory/icons/*.svg examples/memory/icons/*.png Copyright: Fontawesome project @@ -46,6 +58,17 @@ License: LicenseRef-qskinny Files: editors/sublime/LSP.sublime-settings Copyright: Copyright © SixtyFPS GmbH +<<<<<<< HEAD +License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial + +Files: tools/slintpad/*.html tools/slintpad/styles/*.css tools/slintpad/*.json +Copyright: Copyright © SixtyFPS GmbH +License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial + +Files: editors/vscode/*.json editors/vscode/css/*.css editors/tree-sitter-slint/corpus/*.txt editors/vscode/static/**/*.html editors/vscode/static/assets/img/bg-dark.svg editors/vscode/static/assets/img/slint-*.svg +Copyright: Copyright © SixtyFPS GmbH +License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial Files: tools/slintpad/*.html tools/slintpad/styles/*.css tools/slintpad/*.json @@ -55,6 +78,7 @@ License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-comme Files: editors/vscode/*.json editors/vscode/css/*.css editors/tree-sitter-slint/corpus/*.txt editors/vscode/static/**/*.html editors/vscode/static/assets/img/bg-dark.svg editors/vscode/static/assets/img/slint-*.svg Copyright: Copyright © SixtyFPS GmbH License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Files: editors/vscode/static/assets/img/cpp_logo.svg Copyright: Copyright © 2017 Jeremy Kratz @@ -70,11 +94,19 @@ License: CC0-1.0 Files: tests/screenshots/**/*.png Copyright: Copyright © SixtyFPS GmbH +<<<<<<< HEAD +License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial + +Files: api/node/__test__/resources/*.png +Copyright: Copyright © SixtyFPS GmbH +License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial Files: api/node/__test__/resources/*.png Copyright: Copyright © SixtyFPS GmbH License: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Files: examples/carousel/icons/*.svg Copyright: Material Icons diff --git a/CHANGELOG.md b/CHANGELOG.md index d8ec3fd3553..fb204c10768 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Changelog All notable changes to this project are documented in this file. diff --git a/CMakeLists.txt b/CMakeLists.txt index a74e9927741..890abc6434a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 cmake_minimum_required(VERSION 3.21) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3d9aeb8b8f7..90decb1f0ca 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Contributing diff --git a/Cargo.toml b/Cargo.toml index 1ca80071a59..2b137cc0f53 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [workspace] members = [ @@ -100,7 +104,11 @@ documentation = "https://slint.dev/docs" edition = "2021" homepage = "https://slint.dev" keywords = ["gui", "toolkit", "graphics", "design", "ui"] +<<<<<<< HEAD +license = "GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial" +======= license = "GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial" +>>>>>>> 303633443647db52f33842b9707e25e3067db232 repository = "https://github.com/slint-ui/slint" rust-version = "1.73" version = "1.6.0" diff --git a/FAQ.md b/FAQ.md index ca4c3866455..238889405c5 100644 --- a/FAQ.md +++ b/FAQ.md @@ -51,7 +51,11 @@ types of programming languages. ## Licensing +<<<<<<< HEAD +Slint is available under a [royalty-free license](LICENSES/LicenseRef-Slint-Royalty-free-1.2.md) or [GNU GPLv3](LICENSES/GPL-3.0-only.txt), at your choice. For paid plans, visit our website [https://slint.dev](https://slint.dev) or contact us at [info@slint.dev](mailto:info@slint.dev). +======= Slint is available under a [royalty-free license](LICENSES/LicenseRef-Slint-Royalty-free.md) or [GNU GPLv3](LICENSES/GPL-3.0-only.txt), at your choice. For paid plans, visit our website [https://slint.dev](https://slint.dev) or contact us at [info@slint.dev](mailto:info@slint.dev). +>>>>>>> 303633443647db52f33842b9707e25e3067db232 ### Royalty-free license diff --git a/LICENSE.md b/LICENSE.md index 7731fe51ba7..0fc538552db 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,10 +1,18 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Slint License You can use Slint under ***any*** of the following licenses, at your choice: +<<<<<<< HEAD +1. [Royalty-free license](LICENSES/LicenseRef-Slint-Royalty-free-1.2.md), +======= 1. [Royalty-free license](LICENSES/LicenseRef-Slint-Royalty-free.md), +>>>>>>> 303633443647db52f33842b9707e25e3067db232 2. [GNU GPLv3](LICENSES/GPL-3.0-only.txt), 3. [Commercial license](LICENSES/LicenseRef-Slint-commercial.md). diff --git a/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 100644 index 00000000000..f6d712f410f --- /dev/null +++ b/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1,39 @@ +# Slint Royalty-free Desktop, Mobile, and Web Applications License v1.2 + +## Preamble + +Slint is a toolkit that can be used to build user interfaces for applications. Slint (hereafter referred to as "Software") is made available under different licenses by SixtyFPS GmbH incorporated at Oranienburger Str. 44, 16540 Hohen Neuendorf, Germany ("SixtyFPS"). The "Slint Royalty-free Desktop, Mobile, and Web Applications License" is suitable for those who develop desktop, mobile, or web applications and do not want to use open source components under copyleft licenses. + +### 1. Grant of Rights + +SixtyFPS hereby grants You a world-wide, royalty-free, non-exclusive license to use, reproduce, make available, modify, display, perform, distribute the Software as part of a Desktop, Mobile, or Web Application. + +A Desktop Application is a computer program that is designed to run on a general-purpose computer (PC or notebook), typically installed and executed locally on the computer's operating system. + +A Mobile Application is a computer program that is designed to run on a general-purpose mobile computer (mobile phone or tablet), typically installed and executed locally on the computer's operating system. + +A Web Application is a computer program that is running on a server and accessed using a web browser or client program. + +Desktop Application, Mobile Application, and Web Application are hereafter referred to as "Application". + +### 2. License Conditions - Attribution + +You may distribute the Software as part of an Application, modified or unmodified, provided that You do either of the following: + +(a) Display the [`AboutSlint`](https://slint.dev/snapshots/master/docs/slint/src/language/widgets/aboutslint.html) widget in an "About" screen or dialog that is accessible from the top level menu of the Application. In the absence of such a screen or dialog, display the widget in the "Splash Screen" of the Application. + +(b) Display the [Slint attribution badge](https://github.com/slint-ui/slint/tree/master/logo/MadeWithSlint-logo-whitebg.png) on a public webpage, preferably where the binaries of your Application can be downloaded from, in such a way that it can be easily found by any visitor to that page. + +### 3. Limitations + +The license does not permit to distribute or make the Software publicly available alone and without integration into an Application. For this purpose you may use the Software under the GNU General Public License, version 3. + +The license does not permit the use of the Software within Embedded Systems. An Embedded System is a computer system designed to perform a specific task within a larger mechanical or electrical system. + +You may not remove or alter any license notices (including copyright notices, disclaimers of warranty, or limitations of liability) contained within the source code form of the Software. + +### 4. Warranty and Liability + +SixtyFPS is only liable for conflicting rights of third parties if SixtyFPS was aware of these rights without informing you. Unless required by applicable law or agreed to in writing, SixtyFPS provides the SOFTWARE on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. + +UNLESS REQUIRED BY LAW, SIXTYFPS WON'T BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE SOFTWARE. diff --git a/README.md b/README.md index 1d0d9800b44..4850fba5023 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 ![Slint](./logo/slint-logo-full-light.svg#gh-light-mode-only) ![Slint](./logo/slint-logo-full-dark.svg#gh-dark-mode-only) @@ -185,7 +189,11 @@ configure your favorite editor to work well with Slint. You can use Slint under ***any*** of the following licenses, at your choice: +<<<<<<< HEAD +1. [Royalty-free license](LICENSES/LicenseRef-Slint-Royalty-free-1.2.md), +======= 1. [Royalty-free license](LICENSES/LicenseRef-Slint-Royalty-free.md), +>>>>>>> 303633443647db52f33842b9707e25e3067db232 2. [GNU GPLv3](LICENSES/GPL-3.0-only.txt), 3. [Paid license](https://slint.dev/pricing.html). diff --git a/api/cpp/CMakeLists.txt b/api/cpp/CMakeLists.txt index e45d4d6efd7..5c0720a20d5 100644 --- a/api/cpp/CMakeLists.txt +++ b/api/cpp/CMakeLists.txt @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 cmake_minimum_required(VERSION 3.21) # Select C++ and C as languages, as Corrosion needs ${CMAKE_C_COMPILER} diff --git a/api/cpp/Cargo.toml b/api/cpp/Cargo.toml index d8e385b9b1b..8176bdee754 100644 --- a/api/cpp/Cargo.toml +++ b/api/cpp/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "slint-cpp" diff --git a/api/cpp/README.md b/api/cpp/README.md index 63789d26615..015ba8f9141 100644 --- a/api/cpp/README.md +++ b/api/cpp/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Slint-cpp diff --git a/api/cpp/build.rs b/api/cpp/build.rs index efe6b974abe..2cab087bb51 100644 --- a/api/cpp/build.rs +++ b/api/cpp/build.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::cbindgen::EnabledFeatures; use std::path::Path; diff --git a/api/cpp/cbindgen.rs b/api/cpp/cbindgen.rs index 9b6394d1cab..21387838ad2 100644 --- a/api/cpp/cbindgen.rs +++ b/api/cpp/cbindgen.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use anyhow::Context; use std::io::{BufWriter, Write}; diff --git a/api/cpp/cmake/SlintConfig.cmake.in b/api/cpp/cmake/SlintConfig.cmake.in index c952eeb6f33..37669e1fed2 100644 --- a/api/cpp/cmake/SlintConfig.cmake.in +++ b/api/cpp/cmake/SlintConfig.cmake.in @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 @PACKAGE_INIT@ diff --git a/api/cpp/cmake/SlintMacro.cmake b/api/cpp/cmake/SlintMacro.cmake index 0f0768b1063..9fa56c43897 100644 --- a/api/cpp/cmake/SlintMacro.cmake +++ b/api/cpp/cmake/SlintMacro.cmake @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Set up machinery to handle SLINT_EMBED_RESOURCES target property set(DEFAULT_SLINT_EMBED_RESOURCES as-absolute-path CACHE STRING diff --git a/api/cpp/esp-idf/slint/CMakeLists.txt b/api/cpp/esp-idf/slint/CMakeLists.txt index a5877f69d51..3a8fc68fb78 100644 --- a/api/cpp/esp-idf/slint/CMakeLists.txt +++ b/api/cpp/esp-idf/slint/CMakeLists.txt @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 idf_component_register( SRCS "src/slint-esp.cpp" diff --git a/api/cpp/esp-idf/slint/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/api/cpp/esp-idf/slint/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..ba45178f502 --- /dev/null +++ b/api/cpp/esp-idf/slint/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/api/cpp/esp-idf/slint/README.md b/api/cpp/esp-idf/slint/README.md index 68c73006a4c..b41b66d1234 100644 --- a/api/cpp/esp-idf/slint/README.md +++ b/api/cpp/esp-idf/slint/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Slint diff --git a/api/cpp/esp-idf/slint/idf_component.yml b/api/cpp/esp-idf/slint/idf_component.yml index 48db5f40b4d..d81f0b16509 100644 --- a/api/cpp/esp-idf/slint/idf_component.yml +++ b/api/cpp/esp-idf/slint/idf_component.yml @@ -1,9 +1,17 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial + +description: "Slint — declarative GUI toolkit" +url: "https://slint.dev" +license: "GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial" +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial description: "Slint — declarative GUI toolkit" url: "https://slint.dev" license: "GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial" +>>>>>>> 303633443647db52f33842b9707e25e3067db232 version: "1.6.0" discussion: "https://github.com/slint-ui/slint/discussions" documentation: "https://slint.dev/docs" diff --git a/api/cpp/esp-idf/slint/include/slint-esp.h b/api/cpp/esp-idf/slint/include/slint-esp.h index 948db8c57f2..a0a911f0440 100644 --- a/api/cpp/esp-idf/slint/include/slint-esp.h +++ b/api/cpp/esp-idf/slint/include/slint-esp.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once diff --git a/api/cpp/esp-idf/slint/src/slint-esp.cpp b/api/cpp/esp-idf/slint/src/slint-esp.cpp index db20aee50c5..a1af5db5243 100644 --- a/api/cpp/esp-idf/slint/src/slint-esp.cpp +++ b/api/cpp/esp-idf/slint/src/slint-esp.cpp @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #include #include diff --git a/api/cpp/include/slint-interpreter.h b/api/cpp/include/slint-interpreter.h index 384d11812eb..e1beac85bc1 100644 --- a/api/cpp/include/slint-interpreter.h +++ b/api/cpp/include/slint-interpreter.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once diff --git a/api/cpp/include/slint-platform.h b/api/cpp/include/slint-platform.h index 6c97fe6a65f..c7fae815901 100644 --- a/api/cpp/include/slint-platform.h +++ b/api/cpp/include/slint-platform.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once diff --git a/api/cpp/include/slint.h b/api/cpp/include/slint.h index d7cab701416..b03ff42be49 100644 --- a/api/cpp/include/slint.h +++ b/api/cpp/include/slint.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once diff --git a/api/cpp/include/slint_brush.h b/api/cpp/include/slint_brush.h index 57cb78b8cdf..ad7e23c50e5 100644 --- a/api/cpp/include/slint_brush.h +++ b/api/cpp/include/slint_brush.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once #include diff --git a/api/cpp/include/slint_callbacks.h b/api/cpp/include/slint_callbacks.h index 6a88e2f03df..c12cb97a661 100644 --- a/api/cpp/include/slint_callbacks.h +++ b/api/cpp/include/slint_callbacks.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once #include diff --git a/api/cpp/include/slint_color.h b/api/cpp/include/slint_color.h index c92ea97fc96..75043881e44 100644 --- a/api/cpp/include/slint_color.h +++ b/api/cpp/include/slint_color.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once diff --git a/api/cpp/include/slint_config.h b/api/cpp/include/slint_config.h index e7397687b39..a31f1689cf7 100644 --- a/api/cpp/include/slint_config.h +++ b/api/cpp/include/slint_config.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once diff --git a/api/cpp/include/slint_image.h b/api/cpp/include/slint_image.h index 823e075f417..6a691704165 100644 --- a/api/cpp/include/slint_image.h +++ b/api/cpp/include/slint_image.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once #include diff --git a/api/cpp/include/slint_interpreter.h b/api/cpp/include/slint_interpreter.h index 58dccc54faf..6b3ecde671e 100644 --- a/api/cpp/include/slint_interpreter.h +++ b/api/cpp/include/slint_interpreter.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once diff --git a/api/cpp/include/slint_pathdata.h b/api/cpp/include/slint_pathdata.h index 9540ff5aa01..e147dc0ca95 100644 --- a/api/cpp/include/slint_pathdata.h +++ b/api/cpp/include/slint_pathdata.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once #include diff --git a/api/cpp/include/slint_point.h b/api/cpp/include/slint_point.h index f7087c0b429..299372c389c 100644 --- a/api/cpp/include/slint_point.h +++ b/api/cpp/include/slint_point.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once diff --git a/api/cpp/include/slint_properties.h b/api/cpp/include/slint_properties.h index 1e9d9a9bd6b..f8a1ef4614b 100644 --- a/api/cpp/include/slint_properties.h +++ b/api/cpp/include/slint_properties.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once #include diff --git a/api/cpp/include/slint_sharedvector.h b/api/cpp/include/slint_sharedvector.h index fb0ca28d63d..7d1d4c20c5e 100644 --- a/api/cpp/include/slint_sharedvector.h +++ b/api/cpp/include/slint_sharedvector.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once #include "slint_sharedvector_internal.h" diff --git a/api/cpp/include/slint_size.h b/api/cpp/include/slint_size.h index 96e33f12e3f..edcd6990688 100644 --- a/api/cpp/include/slint_size.h +++ b/api/cpp/include/slint_size.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once diff --git a/api/cpp/include/slint_string.h b/api/cpp/include/slint_string.h index 6e4e947538c..a770061d4b9 100644 --- a/api/cpp/include/slint_string.h +++ b/api/cpp/include/slint_string.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once #include diff --git a/api/cpp/include/slint_testing.h b/api/cpp/include/slint_testing.h index 77efcda09c1..7e87a04d97c 100644 --- a/api/cpp/include/slint_testing.h +++ b/api/cpp/include/slint_testing.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once #include "slint.h" diff --git a/api/cpp/include/slint_timer.h b/api/cpp/include/slint_timer.h index d710ac2f092..f9c22f8f49f 100644 --- a/api/cpp/include/slint_timer.h +++ b/api/cpp/include/slint_timer.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore singleshot diff --git a/api/cpp/include/slint_window.h b/api/cpp/include/slint_window.h index 1ea6f259d91..7cd84e70b21 100644 --- a/api/cpp/include/slint_window.h +++ b/api/cpp/include/slint_window.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once diff --git a/api/cpp/include/vtable.h b/api/cpp/include/vtable.h index 9cd058fc041..60a6828f57b 100644 --- a/api/cpp/include/vtable.h +++ b/api/cpp/include/vtable.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once diff --git a/api/cpp/lib.rs b/api/cpp/lib.rs index 9b1f901faef..e9e07209e24 100644 --- a/api/cpp/lib.rs +++ b/api/cpp/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This crate just expose the function used by the C++ integration */ diff --git a/api/cpp/platform.rs b/api/cpp/platform.rs index 9c61a673ed0..262fc24526e 100644 --- a/api/cpp/platform.rs +++ b/api/cpp/platform.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use alloc::rc::Rc; #[cfg(not(feature = "std"))] diff --git a/api/cpp/tests/CMakeLists.txt b/api/cpp/tests/CMakeLists.txt index 383f4099eef..046ecfb2db4 100644 --- a/api/cpp/tests/CMakeLists.txt +++ b/api/cpp/tests/CMakeLists.txt @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 FetchContent_Declare( Catch2 diff --git a/api/cpp/tests/datastructures.cpp b/api/cpp/tests/datastructures.cpp index 03b148f064e..4a565026374 100644 --- a/api/cpp/tests/datastructures.cpp +++ b/api/cpp/tests/datastructures.cpp @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #include #define CATCH_CONFIG_MAIN diff --git a/api/cpp/tests/eventloop.cpp b/api/cpp/tests/eventloop.cpp index 19903874a89..5e8c6ccf2ff 100644 --- a/api/cpp/tests/eventloop.cpp +++ b/api/cpp/tests/eventloop.cpp @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore singleshot diff --git a/api/cpp/tests/interpreter.cpp b/api/cpp/tests/interpreter.cpp index e9125a04dd8..37367f98ae3 100644 --- a/api/cpp/tests/interpreter.cpp +++ b/api/cpp/tests/interpreter.cpp @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #define CATCH_CONFIG_MAIN #include "catch2/catch.hpp" diff --git a/api/cpp/tests/models.cpp b/api/cpp/tests/models.cpp index 7e8005a10eb..95d4ae4efa2 100644 --- a/api/cpp/tests/models.cpp +++ b/api/cpp/tests/models.cpp @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #include #include diff --git a/api/cpp/tests/multiple-includes/CMakeLists.txt b/api/cpp/tests/multiple-includes/CMakeLists.txt index aa8a84cf488..c8c2a01d394 100644 --- a/api/cpp/tests/multiple-includes/CMakeLists.txt +++ b/api/cpp/tests/multiple-includes/CMakeLists.txt @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 add_executable(multiple-includes main.cpp logic.cpp) target_link_libraries(multiple-includes PRIVATE Slint::Slint) diff --git a/api/cpp/tests/multiple-includes/README.md b/api/cpp/tests/multiple-includes/README.md index e2bd938c696..fd85f7f30fe 100644 --- a/api/cpp/tests/multiple-includes/README.md +++ b/api/cpp/tests/multiple-includes/README.md @@ -1,3 +1,7 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 This is a test making sure that the header can be included in several file without causing multiple definitions \ No newline at end of file diff --git a/api/cpp/tests/multiple-includes/appwindow.slint b/api/cpp/tests/multiple-includes/appwindow.slint index 02b7dd5bd31..0e1e5ba00ef 100644 --- a/api/cpp/tests/multiple-includes/appwindow.slint +++ b/api/cpp/tests/multiple-includes/appwindow.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import {Button, AboutSlint} from "std-widgets.slint"; diff --git a/api/cpp/tests/multiple-includes/logic.cpp b/api/cpp/tests/multiple-includes/logic.cpp index 5e861b4f347..540e52fad00 100644 --- a/api/cpp/tests/multiple-includes/logic.cpp +++ b/api/cpp/tests/multiple-includes/logic.cpp @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #include "logic.h" #include "appwindow.h" diff --git a/api/cpp/tests/multiple-includes/logic.h b/api/cpp/tests/multiple-includes/logic.h index 0592b13596e..8decc119678 100644 --- a/api/cpp/tests/multiple-includes/logic.h +++ b/api/cpp/tests/multiple-includes/logic.h @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #pragma once diff --git a/api/cpp/tests/multiple-includes/main.cpp b/api/cpp/tests/multiple-includes/main.cpp index aafde0be669..cf7045168be 100644 --- a/api/cpp/tests/multiple-includes/main.cpp +++ b/api/cpp/tests/multiple-includes/main.cpp @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #include "logic.h" #include "appwindow.h" diff --git a/api/cpp/tests/platform_eventloop.cpp b/api/cpp/tests/platform_eventloop.cpp index b06240325ca..4e1054155de 100644 --- a/api/cpp/tests/platform_eventloop.cpp +++ b/api/cpp/tests/platform_eventloop.cpp @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore singleshot diff --git a/api/cpp/tests/properties.cpp b/api/cpp/tests/properties.cpp index 450e2d169df..e547e4116d2 100644 --- a/api/cpp/tests/properties.cpp +++ b/api/cpp/tests/properties.cpp @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #include #define CATCH_CONFIG_MAIN diff --git a/api/cpp/tests/test.slint b/api/cpp/tests/test.slint index d3ce9722118..d6291d4efed 100644 --- a/api/cpp/tests/test.slint +++ b/api/cpp/tests/test.slint @@ -1,4 +1,8 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export componentTest := Rectangle {} diff --git a/api/cpp/tests/window.cpp b/api/cpp/tests/window.cpp index 26560243d3a..a181a2de3dd 100644 --- a/api/cpp/tests/window.cpp +++ b/api/cpp/tests/window.cpp @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #define CATCH_CONFIG_MAIN #include "catch2/catch.hpp" diff --git a/api/node/.yarnrc.yml b/api/node/.yarnrc.yml index cf78396dead..cffc160400a 100644 --- a/api/node/.yarnrc.yml +++ b/api/node/.yarnrc.yml @@ -1,4 +1,8 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 nodeLinker: node-modules \ No newline at end of file diff --git a/api/node/Cargo.toml b/api/node/Cargo.toml index 10de99b7d7c..88e65f82957 100644 --- a/api/node/Cargo.toml +++ b/api/node/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "slint-node" diff --git a/api/node/README.md b/api/node/README.md index 1f98c74b670..6c850878479 100644 --- a/api/node/README.md +++ b/api/node/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Slint-node (Beta) diff --git a/api/node/__test__/api.spec.mts b/api/node/__test__/api.spec.mts index 573426914cf..bf16ab8868c 100644 --- a/api/node/__test__/api.spec.mts +++ b/api/node/__test__/api.spec.mts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import test from 'ava' import * as path from 'node:path'; diff --git a/api/node/__test__/compiler.spec.mts b/api/node/__test__/compiler.spec.mts index f7541f07400..3eb8415a8f2 100644 --- a/api/node/__test__/compiler.spec.mts +++ b/api/node/__test__/compiler.spec.mts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import test from 'ava' diff --git a/api/node/__test__/eventloop.spec.mts b/api/node/__test__/eventloop.spec.mts index ff1b5fb68fc..47e145895e7 100644 --- a/api/node/__test__/eventloop.spec.mts +++ b/api/node/__test__/eventloop.spec.mts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test that the Slint event loop processes libuv's events. diff --git a/api/node/__test__/globals.spec.mts b/api/node/__test__/globals.spec.mts index df3aec24eeb..22970cb22fd 100644 --- a/api/node/__test__/globals.spec.mts +++ b/api/node/__test__/globals.spec.mts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import test from 'ava'; diff --git a/api/node/__test__/js_value_conversion.spec.mts b/api/node/__test__/js_value_conversion.spec.mts index addacaef7a4..d412b13efca 100644 --- a/api/node/__test__/js_value_conversion.spec.mts +++ b/api/node/__test__/js_value_conversion.spec.mts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import test from 'ava'; import * as path from 'node:path'; diff --git a/api/node/__test__/resources/error.slint b/api/node/__test__/resources/error.slint index 2d4bfb60355..6dd34ab9fd5 100644 --- a/api/node/__test__/resources/error.slint +++ b/api/node/__test__/resources/error.slint @@ -1,8 +1,15 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial + +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial // Copyright © SixtyFPS GmbH // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component Error { out property bool> check: "Test"; diff --git a/api/node/__test__/resources/test-constructor.slint b/api/node/__test__/resources/test-constructor.slint index e5acf035586..6b5cfcf45b4 100644 --- a/api/node/__test__/resources/test-constructor.slint +++ b/api/node/__test__/resources/test-constructor.slint @@ -1,8 +1,15 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial + +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial // Copyright © SixtyFPS GmbH // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component Test { diff --git a/api/node/__test__/resources/test.slint b/api/node/__test__/resources/test.slint index 0998c6701db..d2c55185f61 100644 --- a/api/node/__test__/resources/test.slint +++ b/api/node/__test__/resources/test.slint @@ -1,8 +1,15 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial + +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial // Copyright © SixtyFPS GmbH // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component Test { diff --git a/api/node/__test__/types.spec.mts b/api/node/__test__/types.spec.mts index 2aa3b2e41fe..afa6403016b 100644 --- a/api/node/__test__/types.spec.mts +++ b/api/node/__test__/types.spec.mts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import test from 'ava'; diff --git a/api/node/__test__/window.spec.mts b/api/node/__test__/window.spec.mts index dbc34007ace..5e7ce29765d 100644 --- a/api/node/__test__/window.spec.mts +++ b/api/node/__test__/window.spec.mts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import test from 'ava' diff --git a/api/node/build-on-demand.mjs b/api/node/build-on-demand.mjs index a61c67d0f20..6bb5eb9d82b 100644 --- a/api/node/build-on-demand.mjs +++ b/api/node/build-on-demand.mjs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // This file checks if a binary package was installed (through architecture dependencies), and // builds slint if no binary was found. diff --git a/api/node/build.rs b/api/node/build.rs index 1810016930e..af9234c5120 100644 --- a/api/node/build.rs +++ b/api/node/build.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 fn main() { napi_build::setup(); diff --git a/api/node/index.ts b/api/node/index.ts index 45f43a763a7..0907e1c5d9f 100644 --- a/api/node/index.ts +++ b/api/node/index.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import * as napi from "./rust-module.cjs"; export { diff --git a/api/node/src/interpreter.rs b/api/node/src/interpreter.rs index 71d86ce500e..013ebb20222 100644 --- a/api/node/src/interpreter.rs +++ b/api/node/src/interpreter.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 mod diagnostic; pub use diagnostic::*; diff --git a/api/node/src/interpreter/component_compiler.rs b/api/node/src/interpreter/component_compiler.rs index bcecd7e60cb..ef742d9a687 100644 --- a/api/node/src/interpreter/component_compiler.rs +++ b/api/node/src/interpreter/component_compiler.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::collections::HashMap; use std::path::PathBuf; diff --git a/api/node/src/interpreter/component_definition.rs b/api/node/src/interpreter/component_definition.rs index 5410a0554df..b10c35c68a3 100644 --- a/api/node/src/interpreter/component_definition.rs +++ b/api/node/src/interpreter/component_definition.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use napi::Result; use slint_interpreter::ComponentDefinition; diff --git a/api/node/src/interpreter/component_instance.rs b/api/node/src/interpreter/component_instance.rs index 58a4f7bbd6f..9deddc788f0 100644 --- a/api/node/src/interpreter/component_instance.rs +++ b/api/node/src/interpreter/component_instance.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_compiler::langtype::Type; use i_slint_core::window::WindowInner; diff --git a/api/node/src/interpreter/diagnostic.rs b/api/node/src/interpreter/diagnostic.rs index ce3ad756bc5..adbde6570b0 100644 --- a/api/node/src/interpreter/diagnostic.rs +++ b/api/node/src/interpreter/diagnostic.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use slint_interpreter::{Diagnostic, DiagnosticLevel}; diff --git a/api/node/src/interpreter/value.rs b/api/node/src/interpreter/value.rs index 0f6ba5a6eef..2d485c79817 100644 --- a/api/node/src/interpreter/value.rs +++ b/api/node/src/interpreter/value.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::{ js_into_rust_model, rust_into_js_model, ReadOnlyRustModel, RgbaColor, SlintBrush, diff --git a/api/node/src/interpreter/window.rs b/api/node/src/interpreter/window.rs index 9e6f5c27dba..d5c458dc134 100644 --- a/api/node/src/interpreter/window.rs +++ b/api/node/src/interpreter/window.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::types::{SlintPoint, SlintSize}; use i_slint_core::window::WindowAdapterRc; diff --git a/api/node/src/lib.rs b/api/node/src/lib.rs index a1192faf85d..881282b3ad2 100644 --- a/api/node/src/lib.rs +++ b/api/node/src/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 mod interpreter; pub use interpreter::*; diff --git a/api/node/src/types.rs b/api/node/src/types.rs index 736494d7517..17f96def70f 100644 --- a/api/node/src/types.rs +++ b/api/node/src/types.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 mod brush; pub use brush::*; diff --git a/api/node/src/types/brush.rs b/api/node/src/types/brush.rs index d46a8365908..b0fa30dc69a 100644 --- a/api/node/src/types/brush.rs +++ b/api/node/src/types/brush.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_core::{graphics::GradientStop, Brush, Color}; use napi::{bindgen_prelude::External, Error, Result}; diff --git a/api/node/src/types/image_data.rs b/api/node/src/types/image_data.rs index ec0692ae40f..de9a37531d4 100644 --- a/api/node/src/types/image_data.rs +++ b/api/node/src/types/image_data.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::vec; diff --git a/api/node/src/types/model.rs b/api/node/src/types/model.rs index 57184031441..ad2eabe0f1e 100644 --- a/api/node/src/types/model.rs +++ b/api/node/src/types/model.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::rc::Rc; diff --git a/api/node/src/types/point.rs b/api/node/src/types/point.rs index 6b6ee49d542..4056d761316 100644 --- a/api/node/src/types/point.rs +++ b/api/node/src/types/point.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use napi::{ bindgen_prelude::{FromNapiValue, Object}, diff --git a/api/node/src/types/size.rs b/api/node/src/types/size.rs index e406ace935a..85dd3b3bd73 100644 --- a/api/node/src/types/size.rs +++ b/api/node/src/types/size.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use napi::{ bindgen_prelude::{FromNapiValue, Object}, diff --git a/api/python/Cargo.toml b/api/python/Cargo.toml index d40649e42f4..40176386a74 100644 --- a/api/python/Cargo.toml +++ b/api/python/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "slint-python" diff --git a/api/python/README.md b/api/python/README.md index bdbc4ed8722..9272960babc 100644 --- a/api/python/README.md +++ b/api/python/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Slint-python (Alpha) diff --git a/api/python/brush.rs b/api/python/brush.rs index c80d62bdc29..b29098630a8 100644 --- a/api/python/brush.rs +++ b/api/python/brush.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use pyo3::prelude::*; diff --git a/api/python/errors.rs b/api/python/errors.rs index 2cb5f7e55fa..b52a99f0522 100644 --- a/api/python/errors.rs +++ b/api/python/errors.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use pyo3::PyErr; diff --git a/api/python/image.rs b/api/python/image.rs index 2963940f3fa..3542b49fc4e 100644 --- a/api/python/image.rs +++ b/api/python/image.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use pyo3::prelude::*; diff --git a/api/python/interpreter.rs b/api/python/interpreter.rs index c71d8a126e7..dccb450e864 100644 --- a/api/python/interpreter.rs +++ b/api/python/interpreter.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::cell::RefCell; use std::collections::HashMap; diff --git a/api/python/lib.rs b/api/python/lib.rs index eea56c07674..742e2660fcd 100644 --- a/api/python/lib.rs +++ b/api/python/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 mod image; mod interpreter; diff --git a/api/python/models.rs b/api/python/models.rs index 85bcc8c5f51..c0dc65c93fc 100644 --- a/api/python/models.rs +++ b/api/python/models.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::cell::RefCell; use std::rc::Rc; diff --git a/api/python/noxfile.py b/api/python/noxfile.py index f0c655b33d5..d373649693b 100644 --- a/api/python/noxfile.py +++ b/api/python/noxfile.py @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import nox diff --git a/api/python/pyproject.toml b/api/python/pyproject.toml index aa511f4eb13..892abbe608f 100644 --- a/api/python/pyproject.toml +++ b/api/python/pyproject.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [build-system] requires = ["maturin>=1,<2"] diff --git a/api/python/slint/__init__.py b/api/python/slint/__init__.py index 3a1bed11ba7..203225519c9 100644 --- a/api/python/slint/__init__.py +++ b/api/python/slint/__init__.py @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 from importlib.machinery import ModuleSpec import os diff --git a/api/python/slint/models.py b/api/python/slint/models.py index 788c0d2bb58..9636ed81396 100644 --- a/api/python/slint/models.py +++ b/api/python/slint/models.py @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 from . import slint as native diff --git a/api/python/tests/test_brush.py b/api/python/tests/test_brush.py index 4a63da99fee..91449a1968f 100644 --- a/api/python/tests/test_brush.py +++ b/api/python/tests/test_brush.py @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 from slint import slint as native diff --git a/api/python/tests/test_callback_decorators.py b/api/python/tests/test_callback_decorators.py index 79f50f04c88..c2ad4dcc545 100644 --- a/api/python/tests/test_callback_decorators.py +++ b/api/python/tests/test_callback_decorators.py @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 from slint import load_file, CompileError import slint diff --git a/api/python/tests/test_compiler.py b/api/python/tests/test_compiler.py index 29688f271ce..690a5382655 100644 --- a/api/python/tests/test_compiler.py +++ b/api/python/tests/test_compiler.py @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import pytest from slint import slint as native diff --git a/api/python/tests/test_gc.py b/api/python/tests/test_gc.py index d45a26bf302..8e26097a870 100644 --- a/api/python/tests/test_gc.py +++ b/api/python/tests/test_gc.py @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 from slint import slint as native import weakref diff --git a/api/python/tests/test_import.py b/api/python/tests/test_import.py index cfeec93e523..664d41cb637 100644 --- a/api/python/tests/test_import.py +++ b/api/python/tests/test_import.py @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import pytest from slint import slint as native diff --git a/api/python/tests/test_instance.py b/api/python/tests/test_instance.py index 1f161b4d85b..f4969b16939 100644 --- a/api/python/tests/test_instance.py +++ b/api/python/tests/test_instance.py @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import pytest from slint import slint as native diff --git a/api/python/tests/test_load_file.py b/api/python/tests/test_load_file.py index 09fa031fff7..59dedb31cb2 100644 --- a/api/python/tests/test_load_file.py +++ b/api/python/tests/test_load_file.py @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import pytest from slint import load_file, CompileError diff --git a/api/python/tests/test_load_file.slint b/api/python/tests/test_load_file.slint index 66c48ee142b..5ee15fb7c36 100644 --- a/api/python/tests/test_load_file.slint +++ b/api/python/tests/test_load_file.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export global MyGlobal { in-out property global-prop: "This is global"; diff --git a/api/python/tests/test_models.py b/api/python/tests/test_models.py index 6be4a171f21..8e3830c254d 100644 --- a/api/python/tests/test_models.py +++ b/api/python/tests/test_models.py @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 from slint import slint as native from slint import models as models diff --git a/api/python/tests/test_timers.py b/api/python/tests/test_timers.py index f20936b7c64..532a7f49a95 100644 --- a/api/python/tests/test_timers.py +++ b/api/python/tests/test_timers.py @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import pytest from slint import slint as native diff --git a/api/python/timer.rs b/api/python/timer.rs index 63cc1dca80d..8183ae0c56f 100644 --- a/api/python/timer.rs +++ b/api/python/timer.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use pyo3::prelude::*; diff --git a/api/python/value.rs b/api/python/value.rs index 15aadeb97b7..4d19d78b78c 100644 --- a/api/python/value.rs +++ b/api/python/value.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use pyo3::prelude::*; use pyo3::types::{IntoPyDict, PyDict}; diff --git a/api/rs/build/Cargo.toml b/api/rs/build/Cargo.toml index 8c154c7147b..a05e134a336 100644 --- a/api/rs/build/Cargo.toml +++ b/api/rs/build/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "slint-build" diff --git a/api/rs/build/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/api/rs/build/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..f6a4790a3fd --- /dev/null +++ b/api/rs/build/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/api/rs/build/lib.rs b/api/rs/build/lib.rs index 32dd72da8ef..9fc15fe15c0 100644 --- a/api/rs/build/lib.rs +++ b/api/rs/build/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This crate serves as a companion crate of the slint crate. diff --git a/api/rs/macros/Cargo.toml b/api/rs/macros/Cargo.toml index a7e74fafc8e..ea1f62ffccf 100644 --- a/api/rs/macros/Cargo.toml +++ b/api/rs/macros/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "slint-macros" diff --git a/api/rs/macros/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/api/rs/macros/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..f6a4790a3fd --- /dev/null +++ b/api/rs/macros/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/api/rs/macros/README.md b/api/rs/macros/README.md index ea76e0620cf..b75d5a32e9a 100644 --- a/api/rs/macros/README.md +++ b/api/rs/macros/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 **NOTE**: This library is an **internal** crate for the [Slint project](https://slint.rs). This crate should **not be used directly** by applications using Slint. diff --git a/api/rs/macros/lib.rs b/api/rs/macros/lib.rs index ac689062342..7aa71ffa06f 100644 --- a/api/rs/macros/lib.rs +++ b/api/rs/macros/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell:ignore punct diff --git a/api/rs/slint/Cargo.toml b/api/rs/slint/Cargo.toml index 536d63ca91b..2253ac4f907 100644 --- a/api/rs/slint/Cargo.toml +++ b/api/rs/slint/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "slint" diff --git a/api/rs/slint/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/api/rs/slint/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..f6a4790a3fd --- /dev/null +++ b/api/rs/slint/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/api/rs/slint/README.md b/api/rs/slint/README.md index 5188c7a3db0..5acd6823a73 100644 --- a/api/rs/slint/README.md +++ b/api/rs/slint/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Slint diff --git a/api/rs/slint/android.rs b/api/rs/slint/android.rs index 7f28f7301bf..78a61fd5262 100644 --- a/api/rs/slint/android.rs +++ b/api/rs/slint/android.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Android backend. //! diff --git a/api/rs/slint/compile_fail_tests.rs b/api/rs/slint/compile_fail_tests.rs index 704ef4b2200..49ccae13857 100644 --- a/api/rs/slint/compile_fail_tests.rs +++ b/api/rs/slint/compile_fail_tests.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /** Test that the tokenizer properly rejects tokens with spaces. diff --git a/api/rs/slint/docs.rs b/api/rs/slint/docs.rs index e13ed54e5eb..80b7a71941c 100644 --- a/api/rs/slint/docs.rs +++ b/api/rs/slint/docs.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![cfg(doc)] /*! diff --git a/api/rs/slint/lib.rs b/api/rs/slint/lib.rs index 28fbd15de5e..d5f21349074 100644 --- a/api/rs/slint/lib.rs +++ b/api/rs/slint/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore buildrs diff --git a/api/rs/slint/private_unstable_api.rs b/api/rs/slint/private_unstable_api.rs index 360797daedf..848352c7930 100644 --- a/api/rs/slint/private_unstable_api.rs +++ b/api/rs/slint/private_unstable_api.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Module containing the private api that is used by the generated code. //! diff --git a/api/rs/slint/tests/partial_renderer.rs b/api/rs/slint/tests/partial_renderer.rs index a941595d06a..6a89d3fc1b0 100644 --- a/api/rs/slint/tests/partial_renderer.rs +++ b/api/rs/slint/tests/partial_renderer.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use slint::platform::software_renderer::{ MinimalSoftwareWindow, PremultipliedRgbaColor, SoftwareRenderer, TargetPixel, diff --git a/api/rs/slint/tests/show_strongref.rs b/api/rs/slint/tests/show_strongref.rs index ac42384b855..f24322075eb 100644 --- a/api/rs/slint/tests/show_strongref.rs +++ b/api/rs/slint/tests/show_strongref.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use ::slint::slint; diff --git a/api/rs/slint/tests/simple_macro.rs b/api/rs/slint/tests/simple_macro.rs index 43d945157c1..88e830cbc58 100644 --- a/api/rs/slint/tests/simple_macro.rs +++ b/api/rs/slint/tests/simple_macro.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use ::slint::slint; diff --git a/api/rs/slint/tests/spawn_local.rs b/api/rs/slint/tests/spawn_local.rs index 6ffa47165d5..3841a270795 100644 --- a/api/rs/slint/tests/spawn_local.rs +++ b/api/rs/slint/tests/spawn_local.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /// Code from https://doc.rust-lang.org/std/task/trait.Wake.html#examples mod executor { diff --git a/api/wasm-interpreter/Cargo.toml b/api/wasm-interpreter/Cargo.toml index 3c74e4bd5e4..1df9f014bac 100644 --- a/api/wasm-interpreter/Cargo.toml +++ b/api/wasm-interpreter/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "slint-wasm-interpreter" diff --git a/api/wasm-interpreter/src/lib.rs b/api/wasm-interpreter/src/lib.rs index 81401ddd0b2..82323a3470a 100644 --- a/api/wasm-interpreter/src/lib.rs +++ b/api/wasm-interpreter/src/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This wasm library can be loaded from JS to load and display the content of .slint files #![cfg(target_arch = "wasm32")] diff --git a/cmake/FindOpenGLES2.cmake b/cmake/FindOpenGLES2.cmake index 3da314f2ba8..7572215d43b 100644 --- a/cmake/FindOpenGLES2.cmake +++ b/cmake/FindOpenGLES2.cmake @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 include(CheckCXXSourceCompiles) diff --git a/cmake/FindOpenGLES3.cmake b/cmake/FindOpenGLES3.cmake index 5d17a51d5e3..2f5dd7b2062 100644 --- a/cmake/FindOpenGLES3.cmake +++ b/cmake/FindOpenGLES3.cmake @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 include(CheckCXXSourceCompiles) diff --git a/docker/Dockerfile.aarch64-unknown-linux-gnu b/docker/Dockerfile.aarch64-unknown-linux-gnu index 3c0ffca6bf5..33a41e2ea2e 100644 --- a/docker/Dockerfile.aarch64-unknown-linux-gnu +++ b/docker/Dockerfile.aarch64-unknown-linux-gnu @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Use cross-image once https://github.com/rust-embedded/cross/pull/591 is merged & released #FROM rustembedded/cross:aarch64-unknown-linux-gnu-0.2.1 diff --git a/docker/Dockerfile.armv7-unknown-linux-gnueabihf b/docker/Dockerfile.armv7-unknown-linux-gnueabihf index 2360d1a02f6..8c0db7db2e7 100644 --- a/docker/Dockerfile.armv7-unknown-linux-gnueabihf +++ b/docker/Dockerfile.armv7-unknown-linux-gnueabihf @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Use cross-image once https://github.com/rust-embedded/cross/pull/591 is merged & released #FROM rustembedded/cross:armv7-unknown-linux-gnueabihf-0.2.1 diff --git a/docker/Dockerfile.cpp-image b/docker/Dockerfile.cpp-image index 3e40c7501d9..e404860726f 100644 --- a/docker/Dockerfile.cpp-image +++ b/docker/Dockerfile.cpp-image @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 ARG arch FROM ghcr.io/slint-ui/slint/$arch diff --git a/docker/Dockerfile.riscv64gc-unknown-linux-gnu b/docker/Dockerfile.riscv64gc-unknown-linux-gnu index 49ac64348f6..9702dec8c9f 100644 --- a/docker/Dockerfile.riscv64gc-unknown-linux-gnu +++ b/docker/Dockerfile.riscv64gc-unknown-linux-gnu @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Use cross-image once https://github.com/rust-embedded/cross/pull/591 is merged & released #FROM rustembedded/cross:riscv64gc-unknown-linux-gnu-0.2.1 diff --git a/docker/Dockerfile.torizon-demos b/docker/Dockerfile.torizon-demos index 5de1939eaea..14a8d2dbf7e 100644 --- a/docker/Dockerfile.torizon-demos +++ b/docker/Dockerfile.torizon-demos @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # This docker file builds the Rust binaries of our demos and packages them into a Torizon container diff --git a/docker/Dockerfile.x86_64-unknown-linux-gnu b/docker/Dockerfile.x86_64-unknown-linux-gnu index 4fb97e02466..f54dfe011e9 100644 --- a/docker/Dockerfile.x86_64-unknown-linux-gnu +++ b/docker/Dockerfile.x86_64-unknown-linux-gnu @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Use cross-image once https://github.com/rust-embedded/cross/pull/591 is merged & released # FROM rustembedded/cross:x86_64-unknown-linux-gnu diff --git a/editors/README.md b/editors/README.md index 586a6362b6a..0141b5b9c38 100644 --- a/editors/README.md +++ b/editors/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Editor Configuration for Slint diff --git a/editors/sublime/Slint.sublime-syntax b/editors/sublime/Slint.sublime-syntax index 8ad597298ce..e155026c40c 100644 --- a/editors/sublime/Slint.sublime-syntax +++ b/editors/sublime/Slint.sublime-syntax @@ -1,7 +1,11 @@ %YAML 1.2 --- # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # See http://www.sublimetext.com/docs/3/syntax.html name: Slint diff --git a/editors/tree-sitter-slint/CONTRIBUTING.md b/editors/tree-sitter-slint/CONTRIBUTING.md index cd39a18b2a6..a72119f726b 100644 --- a/editors/tree-sitter-slint/CONTRIBUTING.md +++ b/editors/tree-sitter-slint/CONTRIBUTING.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Contributing diff --git a/editors/tree-sitter-slint/README.md b/editors/tree-sitter-slint/README.md index bf570412853..4a2ca414de4 100644 --- a/editors/tree-sitter-slint/README.md +++ b/editors/tree-sitter-slint/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # tree-sitter support for SLint diff --git a/editors/tree-sitter-slint/grammar.js b/editors/tree-sitter-slint/grammar.js index 960d3967fdf..50d32eaebb4 100644 --- a/editors/tree-sitter-slint/grammar.js +++ b/editors/tree-sitter-slint/grammar.js @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore mult prec diff --git a/editors/tree-sitter-slint/test-to-corpus.py b/editors/tree-sitter-slint/test-to-corpus.py index 2b72f4f3b5c..dc220fa960c 100755 --- a/editors/tree-sitter-slint/test-to-corpus.py +++ b/editors/tree-sitter-slint/test-to-corpus.py @@ -2,7 +2,11 @@ # -*- coding: utf-8 -*- # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Usage: # ```sh diff --git a/editors/vscode/README.md b/editors/vscode/README.md index 3cfda0a6602..3915e09e893 100644 --- a/editors/vscode/README.md +++ b/editors/vscode/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Slint for Visual Studio Code diff --git a/editors/vscode/esbuild.js b/editors/vscode/esbuild.js index 622d940e420..76514cb01bc 100644 --- a/editors/vscode/esbuild.js +++ b/editors/vscode/esbuild.js @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 let wasmPlugin = { name: "wasm", diff --git a/editors/vscode/src/browser-lsp-worker.ts b/editors/vscode/src/browser-lsp-worker.ts index d38a8501ca8..e207684f643 100644 --- a/editors/vscode/src/browser-lsp-worker.ts +++ b/editors/vscode/src/browser-lsp-worker.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import slint_init, * as slint_lsp from "../out/slint_lsp_wasm.js"; import slint_wasm_data from "../out/slint_lsp_wasm_bg.wasm"; diff --git a/editors/vscode/src/browser.ts b/editors/vscode/src/browser.ts index 707ea01bf33..c134d5c874c 100644 --- a/editors/vscode/src/browser.ts +++ b/editors/vscode/src/browser.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // This file is the entry point for the vscode web extension diff --git a/editors/vscode/src/common.ts b/editors/vscode/src/common.ts index d42015bd0a3..4c77693cd26 100644 --- a/editors/vscode/src/common.ts +++ b/editors/vscode/src/common.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore codespaces diff --git a/editors/vscode/src/extension.ts b/editors/vscode/src/extension.ts index 9dcbc66e673..dd8a1b0dfc7 100644 --- a/editors/vscode/src/extension.ts +++ b/editors/vscode/src/extension.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // This file is the entry point for the vscode extension (not the browser one) diff --git a/editors/vscode/src/propertiesView.ts b/editors/vscode/src/propertiesView.ts index 2c30c9b11f0..00428f4ca14 100644 --- a/editors/vscode/src/propertiesView.ts +++ b/editors/vscode/src/propertiesView.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore codicon diff --git a/editors/vscode/src/properties_webview.ts b/editors/vscode/src/properties_webview.ts index a995f670357..2f0611190f9 100644 --- a/editors/vscode/src/properties_webview.ts +++ b/editors/vscode/src/properties_webview.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore codicon codicons diff --git a/editors/vscode/src/wasm_preview.ts b/editors/vscode/src/wasm_preview.ts index c8d13dfa553..fc0f846abac 100644 --- a/editors/vscode/src/wasm_preview.ts +++ b/editors/vscode/src/wasm_preview.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Uri } from "vscode"; diff --git a/editors/vscode/static/walkthroughs/welcome/show_preview.png.license b/editors/vscode/static/walkthroughs/welcome/show_preview.png.license index 591c3fafefd..d1ef965835f 100644 --- a/editors/vscode/static/walkthroughs/welcome/show_preview.png.license +++ b/editors/vscode/static/walkthroughs/welcome/show_preview.png.license @@ -1,2 +1,6 @@ Copyright © SixtyFPS GmbH +<<<<<<< HEAD +SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 diff --git a/examples/mcu-board-support/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/examples/mcu-board-support/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..4225e094c5d --- /dev/null +++ b/examples/mcu-board-support/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/internal/backends/android-activity/Cargo.toml b/internal/backends/android-activity/Cargo.toml index 14ada343169..bb6c1343d51 100644 --- a/internal/backends/android-activity/Cargo.toml +++ b/internal/backends/android-activity/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "i-slint-backend-android-activity" diff --git a/internal/backends/android-activity/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/internal/backends/android-activity/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..f6a4790a3fd --- /dev/null +++ b/internal/backends/android-activity/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/internal/backends/android-activity/README.md b/internal/backends/android-activity/README.md index 38c3f5edb8a..0145d7e54b3 100644 --- a/internal/backends/android-activity/README.md +++ b/internal/backends/android-activity/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 **NOTE**: This library is an **internal** crate of the [Slint project](https://slint.dev). diff --git a/internal/backends/android-activity/androidwindowadapter.rs b/internal/backends/android-activity/androidwindowadapter.rs index be74e47ffff..707816d9a78 100644 --- a/internal/backends/android-activity/androidwindowadapter.rs +++ b/internal/backends/android-activity/androidwindowadapter.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use super::*; use crate::javahelper::{print_jni_error, JavaHelper}; diff --git a/internal/backends/android-activity/build.rs b/internal/backends/android-activity/build.rs index 09564ad6bd7..2608e931334 100644 --- a/internal/backends/android-activity/build.rs +++ b/internal/backends/android-activity/build.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::path::PathBuf; use std::process::Command; diff --git a/internal/backends/android-activity/java/SlintAndroidJavaHelper.java b/internal/backends/android-activity/java/SlintAndroidJavaHelper.java index 8b895122ace..266adf955a0 100644 --- a/internal/backends/android-activity/java/SlintAndroidJavaHelper.java +++ b/internal/backends/android-activity/java/SlintAndroidJavaHelper.java @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import android.view.ActionMode; import android.view.Menu; diff --git a/internal/backends/android-activity/javahelper.rs b/internal/backends/android-activity/javahelper.rs index 68c21735265..ce7d360e3dd 100644 --- a/internal/backends/android-activity/javahelper.rs +++ b/internal/backends/android-activity/javahelper.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use super::*; use i_slint_core::api::{PhysicalPosition, PhysicalSize}; diff --git a/internal/backends/android-activity/lib.rs b/internal/backends/android-activity/lib.rs index bc3418aec04..6f631ed8068 100644 --- a/internal/backends/android-activity/lib.rs +++ b/internal/backends/android-activity/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![doc = include_str!("README.md")] #![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")] diff --git a/internal/backends/linuxkms/Cargo.toml b/internal/backends/linuxkms/Cargo.toml index cb2f9fba915..db67d7acc60 100644 --- a/internal/backends/linuxkms/Cargo.toml +++ b/internal/backends/linuxkms/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "i-slint-backend-linuxkms" diff --git a/internal/backends/linuxkms/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/internal/backends/linuxkms/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..f6a4790a3fd --- /dev/null +++ b/internal/backends/linuxkms/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/internal/backends/linuxkms/README.md b/internal/backends/linuxkms/README.md index 1a440a8c8d7..3b261934e4a 100644 --- a/internal/backends/linuxkms/README.md +++ b/internal/backends/linuxkms/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 **NOTE**: This library is an **internal** crate of the [Slint project](https://slint.dev). This crate should **not be used directly** by applications using Slint. diff --git a/internal/backends/linuxkms/calloop_backend.rs b/internal/backends/linuxkms/calloop_backend.rs index 9ace93d1608..4b29f1a0bad 100644 --- a/internal/backends/linuxkms/calloop_backend.rs +++ b/internal/backends/linuxkms/calloop_backend.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::cell::RefCell; #[cfg(not(feature = "libseat"))] diff --git a/internal/backends/linuxkms/calloop_backend/input.rs b/internal/backends/linuxkms/calloop_backend/input.rs index 7f5d8eac464..91bc9c2729a 100644 --- a/internal/backends/linuxkms/calloop_backend/input.rs +++ b/internal/backends/linuxkms/calloop_backend/input.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This module contains the code to receive input events from libinput diff --git a/internal/backends/linuxkms/display.rs b/internal/backends/linuxkms/display.rs index 01f9643a640..d4dd319292d 100644 --- a/internal/backends/linuxkms/display.rs +++ b/internal/backends/linuxkms/display.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_core::api::PhysicalSize; use i_slint_core::platform::PlatformError; diff --git a/internal/backends/linuxkms/display/gbmdisplay.rs b/internal/backends/linuxkms/display/gbmdisplay.rs index 70f5f9ba823..f42bd104b22 100644 --- a/internal/backends/linuxkms/display/gbmdisplay.rs +++ b/internal/backends/linuxkms/display/gbmdisplay.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use drm::control::Device; use gbm::AsRaw; diff --git a/internal/backends/linuxkms/display/swdisplay.rs b/internal/backends/linuxkms/display/swdisplay.rs index 51f0a75a754..99953e69593 100644 --- a/internal/backends/linuxkms/display/swdisplay.rs +++ b/internal/backends/linuxkms/display/swdisplay.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::cell::RefCell; diff --git a/internal/backends/linuxkms/display/vulkandisplay.rs b/internal/backends/linuxkms/display/vulkandisplay.rs index 22b0fcda2c2..b05cb8cf885 100644 --- a/internal/backends/linuxkms/display/vulkandisplay.rs +++ b/internal/backends/linuxkms/display/vulkandisplay.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_core::api::PhysicalSize as PhysicalWindowSize; use i_slint_core::platform::PlatformError; diff --git a/internal/backends/linuxkms/drmoutput.rs b/internal/backends/linuxkms/drmoutput.rs index b1c0fd2c80a..4f4668d3c12 100644 --- a/internal/backends/linuxkms/drmoutput.rs +++ b/internal/backends/linuxkms/drmoutput.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::cell::{Cell, RefCell}; use std::os::fd::{AsFd, BorrowedFd, OwnedFd}; diff --git a/internal/backends/linuxkms/fullscreenwindowadapter.rs b/internal/backends/linuxkms/fullscreenwindowadapter.rs index e1bee64ce0b..bb437c0ef51 100644 --- a/internal/backends/linuxkms/fullscreenwindowadapter.rs +++ b/internal/backends/linuxkms/fullscreenwindowadapter.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This module contains the window adapter implementation to communicate between Slint and Vulkan + libinput diff --git a/internal/backends/linuxkms/lib.rs b/internal/backends/linuxkms/lib.rs index b1ab85f76df..dc9bb8597e1 100644 --- a/internal/backends/linuxkms/lib.rs +++ b/internal/backends/linuxkms/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![doc = include_str!("README.md")] #![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")] diff --git a/internal/backends/linuxkms/noop_backend.rs b/internal/backends/linuxkms/noop_backend.rs index 4212fb6268d..aaa3716ff15 100644 --- a/internal/backends/linuxkms/noop_backend.rs +++ b/internal/backends/linuxkms/noop_backend.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_core::platform::PlatformError; pub struct Backend {} diff --git a/internal/backends/linuxkms/renderer/femtovg.rs b/internal/backends/linuxkms/renderer/femtovg.rs index c8c28148d67..f4375f8de2c 100644 --- a/internal/backends/linuxkms/renderer/femtovg.rs +++ b/internal/backends/linuxkms/renderer/femtovg.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::{num::NonZeroU32, rc::Rc}; diff --git a/internal/backends/linuxkms/renderer/skia.rs b/internal/backends/linuxkms/renderer/skia.rs index 348718b0314..5d2729e9bca 100644 --- a/internal/backends/linuxkms/renderer/skia.rs +++ b/internal/backends/linuxkms/renderer/skia.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::rc::Rc; diff --git a/internal/backends/qt/Cargo.toml b/internal/backends/qt/Cargo.toml index 6b21b4436b1..ab8dfddb9b5 100644 --- a/internal/backends/qt/Cargo.toml +++ b/internal/backends/qt/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "i-slint-backend-qt" diff --git a/internal/backends/qt/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/internal/backends/qt/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..f6a4790a3fd --- /dev/null +++ b/internal/backends/qt/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/internal/backends/qt/README.md b/internal/backends/qt/README.md index 1a440a8c8d7..3b261934e4a 100644 --- a/internal/backends/qt/README.md +++ b/internal/backends/qt/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 **NOTE**: This library is an **internal** crate of the [Slint project](https://slint.dev). This crate should **not be used directly** by applications using Slint. diff --git a/internal/backends/qt/accessible_generated.rs b/internal/backends/qt/accessible_generated.rs index ccd8fc628a6..6cb4594035c 100644 --- a/internal/backends/qt/accessible_generated.rs +++ b/internal/backends/qt/accessible_generated.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! Generated with Qt5 and ```sh diff --git a/internal/backends/qt/build.rs b/internal/backends/qt/build.rs index 79d4ece9192..d0da526906b 100644 --- a/internal/backends/qt/build.rs +++ b/internal/backends/qt/build.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore listviewitem stylemetrics diff --git a/internal/backends/qt/key_generated.rs b/internal/backends/qt/key_generated.rs index 123313372ae..90db11ccfde 100644 --- a/internal/backends/qt/key_generated.rs +++ b/internal/backends/qt/key_generated.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! Generated with Qt5 and ```sh diff --git a/internal/backends/qt/lib.rs b/internal/backends/qt/lib.rs index 522c4e99b99..0e09309916b 100644 --- a/internal/backends/qt/lib.rs +++ b/internal/backends/qt/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore deinit fnbox qsize diff --git a/internal/backends/qt/qt_accessible.rs b/internal/backends/qt/qt_accessible.rs index 1abb4ad87f8..40620f09c9d 100644 --- a/internal/backends/qt/qt_accessible.rs +++ b/internal/backends/qt/qt_accessible.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cspell:ignore descendents qobject qwidget diff --git a/internal/backends/qt/qt_widgets.rs b/internal/backends/qt/qt_widgets.rs index 0d7daa7d79e..e3799b5e21d 100644 --- a/internal/backends/qt/qt_widgets.rs +++ b/internal/backends/qt/qt_widgets.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! diff --git a/internal/backends/qt/qt_widgets/button.rs b/internal/backends/qt/qt_widgets/button.rs index 21de4e53576..76cdb54dfa5 100644 --- a/internal/backends/qt/qt_widgets/button.rs +++ b/internal/backends/qt/qt_widgets/button.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore qstyle unshade diff --git a/internal/backends/qt/qt_widgets/checkbox.rs b/internal/backends/qt/qt_widgets/checkbox.rs index 4f41467dfd2..928b79696d8 100644 --- a/internal/backends/qt/qt_widgets/checkbox.rs +++ b/internal/backends/qt/qt_widgets/checkbox.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_core::{ input::{FocusEventResult, KeyEventType}, diff --git a/internal/backends/qt/qt_widgets/combobox.rs b/internal/backends/qt/qt_widgets/combobox.rs index 7b7463e2f7f..4c603c8b70d 100644 --- a/internal/backends/qt/qt_widgets/combobox.rs +++ b/internal/backends/qt/qt_widgets/combobox.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_core::input::FocusEventResult; diff --git a/internal/backends/qt/qt_widgets/groupbox.rs b/internal/backends/qt/qt_widgets/groupbox.rs index dc6d1a8e008..23449d203f0 100644 --- a/internal/backends/qt/qt_widgets/groupbox.rs +++ b/internal/backends/qt/qt_widgets/groupbox.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_core::input::FocusEventResult; diff --git a/internal/backends/qt/qt_widgets/lineedit.rs b/internal/backends/qt/qt_widgets/lineedit.rs index 6bdc5d3b343..071ad87a716 100644 --- a/internal/backends/qt/qt_widgets/lineedit.rs +++ b/internal/backends/qt/qt_widgets/lineedit.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_core::input::FocusEventResult; use i_slint_core::items::InputType; diff --git a/internal/backends/qt/qt_widgets/listviewitem.rs b/internal/backends/qt/qt_widgets/listviewitem.rs index d1cea938e41..6ca2cbfad27 100644 --- a/internal/backends/qt/qt_widgets/listviewitem.rs +++ b/internal/backends/qt/qt_widgets/listviewitem.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_core::input::FocusEventResult; diff --git a/internal/backends/qt/qt_widgets/palette.rs b/internal/backends/qt/qt_widgets/palette.rs index 74fd96f0caf..abf1ddd51e4 100644 --- a/internal/backends/qt/qt_widgets/palette.rs +++ b/internal/backends/qt/qt_widgets/palette.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore deinit diff --git a/internal/backends/qt/qt_widgets/progress_indicator.rs b/internal/backends/qt/qt_widgets/progress_indicator.rs index 9fd39740a3e..08c2f45b9c1 100644 --- a/internal/backends/qt/qt_widgets/progress_indicator.rs +++ b/internal/backends/qt/qt_widgets/progress_indicator.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_core::input::FocusEventResult; diff --git a/internal/backends/qt/qt_widgets/scrollview.rs b/internal/backends/qt/qt_widgets/scrollview.rs index 4129a178ef4..9f943416b57 100644 --- a/internal/backends/qt/qt_widgets/scrollview.rs +++ b/internal/backends/qt/qt_widgets/scrollview.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_core::input::FocusEventResult; diff --git a/internal/backends/qt/qt_widgets/slider.rs b/internal/backends/qt/qt_widgets/slider.rs index 0e790d561a3..409ecb842cb 100644 --- a/internal/backends/qt/qt_widgets/slider.rs +++ b/internal/backends/qt/qt_widgets/slider.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_core::{ input::key_codes, diff --git a/internal/backends/qt/qt_widgets/spinbox.rs b/internal/backends/qt/qt_widgets/spinbox.rs index 0fde890e8c9..56b1bcb1ff9 100644 --- a/internal/backends/qt/qt_widgets/spinbox.rs +++ b/internal/backends/qt/qt_widgets/spinbox.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_core::{ input::{FocusEventResult, KeyEventType}, diff --git a/internal/backends/qt/qt_widgets/stylemetrics.rs b/internal/backends/qt/qt_widgets/stylemetrics.rs index b076ce59cb2..85333452bdf 100644 --- a/internal/backends/qt/qt_widgets/stylemetrics.rs +++ b/internal/backends/qt/qt_widgets/stylemetrics.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore deinit diff --git a/internal/backends/qt/qt_widgets/tableheadersection.rs b/internal/backends/qt/qt_widgets/tableheadersection.rs index fa2094dc694..aff4a9825a3 100644 --- a/internal/backends/qt/qt_widgets/tableheadersection.rs +++ b/internal/backends/qt/qt_widgets/tableheadersection.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_core::{input::FocusEventResult, items::SortOrder}; diff --git a/internal/backends/qt/qt_widgets/tabwidget.rs b/internal/backends/qt/qt_widgets/tabwidget.rs index 0c51ff0eaec..4bc50d8d824 100644 --- a/internal/backends/qt/qt_widgets/tabwidget.rs +++ b/internal/backends/qt/qt_widgets/tabwidget.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore hframe qreal tabbar vframe diff --git a/internal/backends/qt/qt_window.rs b/internal/backends/qt/qt_window.rs index fb2a0dcbf9f..16bd1dbfff9 100644 --- a/internal/backends/qt/qt_window.rs +++ b/internal/backends/qt/qt_window.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore frameless qbrush qpointf qreal qwidgetsize svgz diff --git a/internal/backends/selector/Cargo.toml b/internal/backends/selector/Cargo.toml index 162123ae98d..b42659d1711 100644 --- a/internal/backends/selector/Cargo.toml +++ b/internal/backends/selector/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "i-slint-backend-selector" diff --git a/internal/backends/selector/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/internal/backends/selector/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..f6a4790a3fd --- /dev/null +++ b/internal/backends/selector/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/internal/backends/selector/README.md b/internal/backends/selector/README.md index 8a038e80ed1..33078f830d0 100644 --- a/internal/backends/selector/README.md +++ b/internal/backends/selector/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 **NOTE**: This library is an **internal** crate of the [Slint project](https://slint.dev). This crate should **not be used directly** by applications using Slint. diff --git a/internal/backends/selector/build.rs b/internal/backends/selector/build.rs index 8488db108f7..96a9f2d080f 100644 --- a/internal/backends/selector/build.rs +++ b/internal/backends/selector/build.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::path::Path; diff --git a/internal/backends/selector/lib.rs b/internal/backends/selector/lib.rs index 87af0aa7e01..3d27ba32ce7 100644 --- a/internal/backends/selector/lib.rs +++ b/internal/backends/selector/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![doc = include_str!("README.md")] #![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")] diff --git a/internal/backends/testing/Cargo.toml b/internal/backends/testing/Cargo.toml index d632bb82e84..4599f448d35 100644 --- a/internal/backends/testing/Cargo.toml +++ b/internal/backends/testing/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "i-slint-backend-testing" diff --git a/internal/backends/testing/README.md b/internal/backends/testing/README.md index 1a440a8c8d7..3b261934e4a 100644 --- a/internal/backends/testing/README.md +++ b/internal/backends/testing/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 **NOTE**: This library is an **internal** crate of the [Slint project](https://slint.dev). This crate should **not be used directly** by applications using Slint. diff --git a/internal/backends/testing/lib.rs b/internal/backends/testing/lib.rs index bc3f500cee1..1da9f424a07 100644 --- a/internal/backends/testing/lib.rs +++ b/internal/backends/testing/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![doc = include_str!("README.md")] #![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")] diff --git a/internal/backends/winit/Cargo.toml b/internal/backends/winit/Cargo.toml index b08dfad679c..bc924ded2bd 100644 --- a/internal/backends/winit/Cargo.toml +++ b/internal/backends/winit/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "i-slint-backend-winit" diff --git a/internal/backends/winit/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/internal/backends/winit/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..f6a4790a3fd --- /dev/null +++ b/internal/backends/winit/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/internal/backends/winit/README.md b/internal/backends/winit/README.md index 8d5ff5f9ae1..f044d4f71c8 100644 --- a/internal/backends/winit/README.md +++ b/internal/backends/winit/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 **NOTE**: This library is an **internal** crate of the [Slint project](https://slint.dev). This crate should **not be used directly** by applications using Slint. diff --git a/internal/backends/winit/accesskit.rs b/internal/backends/winit/accesskit.rs index a09aee7a1f7..ac4346a9e3f 100644 --- a/internal/backends/winit/accesskit.rs +++ b/internal/backends/winit/accesskit.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::cell::{Cell, RefCell}; use std::collections::HashMap; diff --git a/internal/backends/winit/build.rs b/internal/backends/winit/build.rs index 3f82f7c4022..b3c132b6e74 100644 --- a/internal/backends/winit/build.rs +++ b/internal/backends/winit/build.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use cfg_aliases::cfg_aliases; diff --git a/internal/backends/winit/event_loop.rs b/internal/backends/winit/event_loop.rs index 463e0f0928a..297aae4e390 100644 --- a/internal/backends/winit/event_loop.rs +++ b/internal/backends/winit/event_loop.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![warn(missing_docs)] /*! diff --git a/internal/backends/winit/lib.rs b/internal/backends/winit/lib.rs index b9c142e1a85..cbdc07e2ac3 100644 --- a/internal/backends/winit/lib.rs +++ b/internal/backends/winit/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![doc = include_str!("README.md")] #![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")] diff --git a/internal/backends/winit/renderer/femtovg.rs b/internal/backends/winit/renderer/femtovg.rs index d72ec61a3ce..6ca2271aeeb 100644 --- a/internal/backends/winit/renderer/femtovg.rs +++ b/internal/backends/winit/renderer/femtovg.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::rc::Rc; diff --git a/internal/backends/winit/renderer/femtovg/glcontext.rs b/internal/backends/winit/renderer/femtovg/glcontext.rs index 9a3210c7f12..62b5c233292 100644 --- a/internal/backends/winit/renderer/femtovg/glcontext.rs +++ b/internal/backends/winit/renderer/femtovg/glcontext.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::{num::NonZeroU32, rc::Rc}; diff --git a/internal/backends/winit/renderer/skia.rs b/internal/backends/winit/renderer/skia.rs index 896ba78419b..6809aabd81f 100644 --- a/internal/backends/winit/renderer/skia.rs +++ b/internal/backends/winit/renderer/skia.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::rc::Rc; diff --git a/internal/backends/winit/renderer/sw.rs b/internal/backends/winit/renderer/sw.rs index 87e2c411383..83c4127ec0e 100644 --- a/internal/backends/winit/renderer/sw.rs +++ b/internal/backends/winit/renderer/sw.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Delegate the rendering to the [`i_slint_core::software_renderer::SoftwareRenderer`] diff --git a/internal/backends/winit/wasm_input_helper.rs b/internal/backends/winit/wasm_input_helper.rs index 8cb6de933cb..ee9c570546f 100644 --- a/internal/backends/winit/wasm_input_helper.rs +++ b/internal/backends/winit/wasm_input_helper.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Helper for wasm that adds a hidden `` and process its events //! diff --git a/internal/backends/winit/winitwindowadapter.rs b/internal/backends/winit/winitwindowadapter.rs index 8e1c6ff12d4..874d5e40cf8 100644 --- a/internal/backends/winit/winitwindowadapter.rs +++ b/internal/backends/winit/winitwindowadapter.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This module contains the GraphicsWindow that used to be within corelib. diff --git a/internal/common/Cargo.toml b/internal/common/Cargo.toml index 80957785209..f82c7365959 100644 --- a/internal/common/Cargo.toml +++ b/internal/common/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "i-slint-common" diff --git a/internal/common/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/internal/common/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..4225e094c5d --- /dev/null +++ b/internal/common/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/internal/common/README.md b/internal/common/README.md index 2b0326c949a..d5c6d13b9db 100644 --- a/internal/common/README.md +++ b/internal/common/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 This crate contains internal data structures and code that is shared between the i-slint-core and the i-slint-compiler crates. diff --git a/internal/common/builtin_structs.rs b/internal/common/builtin_structs.rs index 71f7c320150..63dabe8f6e8 100644 --- a/internal/common/builtin_structs.rs +++ b/internal/common/builtin_structs.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This module contains all builtin structures exposed in the .slint language. diff --git a/internal/common/enums.rs b/internal/common/enums.rs index d87efa86654..b5dec285349 100644 --- a/internal/common/enums.rs +++ b/internal/common/enums.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This module contains all enums exposed in the .slint language. diff --git a/internal/common/key_codes.rs b/internal/common/key_codes.rs index 9cde167e146..e89ae084ed7 100644 --- a/internal/common/key_codes.rs +++ b/internal/common/key_codes.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This module is meant to be included by different crate and each crate must define the macro for_each_keys //! diff --git a/internal/common/lib.rs b/internal/common/lib.rs index f6e9915d0b8..ce4b5633e91 100644 --- a/internal/common/lib.rs +++ b/internal/common/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![doc = include_str!("README.md")] #![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")] diff --git a/internal/common/sharedfontdb.rs b/internal/common/sharedfontdb.rs index 8f0a49f168f..ebc2d07f962 100644 --- a/internal/common/sharedfontdb.rs +++ b/internal/common/sharedfontdb.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::cell::RefCell; diff --git a/internal/common/sharedfontdb/fontconfig.rs b/internal/common/sharedfontdb/fontconfig.rs index 207bd6efa8d..fff775e6fb6 100644 --- a/internal/common/sharedfontdb/fontconfig.rs +++ b/internal/common/sharedfontdb/fontconfig.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![allow(unsafe_code)] diff --git a/internal/compiler/Cargo.toml b/internal/compiler/Cargo.toml index 73decff0b69..23ec614db16 100644 --- a/internal/compiler/Cargo.toml +++ b/internal/compiler/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "i-slint-compiler" diff --git a/internal/compiler/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/internal/compiler/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..4225e094c5d --- /dev/null +++ b/internal/compiler/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/internal/compiler/README.md b/internal/compiler/README.md index 050106f824d..b1b9b6f12ee 100644 --- a/internal/compiler/README.md +++ b/internal/compiler/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # The Slint Compiler Library diff --git a/internal/compiler/build.rs b/internal/compiler/build.rs index 2ab5a818766..17144785e99 100644 --- a/internal/compiler/build.rs +++ b/internal/compiler/build.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::fs::read_dir; use std::io::{BufWriter, Write}; diff --git a/internal/compiler/builtin_macros.rs b/internal/compiler/builtin_macros.rs index dbdeae7445d..6de9316b95f 100644 --- a/internal/compiler/builtin_macros.rs +++ b/internal/compiler/builtin_macros.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This module contains the implementation of the builtin macros. //! They are just transformations that convert into some more complicated expression tree diff --git a/internal/compiler/builtins.slint b/internal/compiler/builtins.slint index 6d23d2a26ff..2f1f8d16838 100644 --- a/internal/compiler/builtins.slint +++ b/internal/compiler/builtins.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore langtype typeregister diff --git a/internal/compiler/diagnostics.rs b/internal/compiler/diagnostics.rs index 15f4b857d0e..bdb472afcd9 100644 --- a/internal/compiler/diagnostics.rs +++ b/internal/compiler/diagnostics.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::io::Read; use std::path::{Path, PathBuf}; diff --git a/internal/compiler/embedded_resources.rs b/internal/compiler/embedded_resources.rs index 0c03f9cf70d..3e390cc9674 100644 --- a/internal/compiler/embedded_resources.rs +++ b/internal/compiler/embedded_resources.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #[cfg(feature = "software-renderer")] pub use resvg::tiny_skia::IntRect as Rect; diff --git a/internal/compiler/expression_tree.rs b/internal/compiler/expression_tree.rs index a67a97b0eef..1367f4849d6 100644 --- a/internal/compiler/expression_tree.rs +++ b/internal/compiler/expression_tree.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::diagnostics::{BuildDiagnostics, SourceLocation, Spanned}; use crate::langtype::{BuiltinElement, EnumerationValue, Type}; diff --git a/internal/compiler/fileaccess.rs b/internal/compiler/fileaccess.rs index 3c5cd9afbfb..f2cc976b25d 100644 --- a/internal/compiler/fileaccess.rs +++ b/internal/compiler/fileaccess.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::borrow::Cow; diff --git a/internal/compiler/generator.rs b/internal/compiler/generator.rs index f6a7ff66522..7f867e812ad 100644 --- a/internal/compiler/generator.rs +++ b/internal/compiler/generator.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! The module responsible for the code generation. diff --git a/internal/compiler/generator/cpp.rs b/internal/compiler/generator/cpp.rs index 833537d40a4..a15e852cefe 100644 --- a/internal/compiler/generator/cpp.rs +++ b/internal/compiler/generator/cpp.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! module for the C++ code generator */ diff --git a/internal/compiler/generator/rust.rs b/internal/compiler/generator/rust.rs index 86efce17de9..933630aac72 100644 --- a/internal/compiler/generator/rust.rs +++ b/internal/compiler/generator/rust.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore conv gdata powf punct vref diff --git a/internal/compiler/langtype.rs b/internal/compiler/langtype.rs index 6ee167bf040..084be78f06d 100644 --- a/internal/compiler/langtype.rs +++ b/internal/compiler/langtype.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::borrow::Cow; use std::collections::{BTreeMap, HashMap, HashSet}; diff --git a/internal/compiler/layout.rs b/internal/compiler/layout.rs index f8a0601e0d9..b455a46c271 100644 --- a/internal/compiler/layout.rs +++ b/internal/compiler/layout.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Datastructures used to represent layouts in the compiler diff --git a/internal/compiler/lexer.rs b/internal/compiler/lexer.rs index 3a4d3d4eab3..c16e9f6273b 100644 --- a/internal/compiler/lexer.rs +++ b/internal/compiler/lexer.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This module contains the code for the lexer. //! diff --git a/internal/compiler/lib.rs b/internal/compiler/lib.rs index ed02c77644f..e521be8b5c1 100644 --- a/internal/compiler/lib.rs +++ b/internal/compiler/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![doc = include_str!("README.md")] #![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")] diff --git a/internal/compiler/literals.rs b/internal/compiler/literals.rs index c4f05ca7c2e..97ff0326041 100644 --- a/internal/compiler/literals.rs +++ b/internal/compiler/literals.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::expression_tree::Expression; use crate::expression_tree::Unit; diff --git a/internal/compiler/llr.rs b/internal/compiler/llr.rs index fc37d743b0f..e4807ce66e3 100644 --- a/internal/compiler/llr.rs +++ b/internal/compiler/llr.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! The Low Level Representation module diff --git a/internal/compiler/llr/expression.rs b/internal/compiler/llr/expression.rs index d2706eafa9f..dff9a09348f 100644 --- a/internal/compiler/llr/expression.rs +++ b/internal/compiler/llr/expression.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use super::PropertyReference; use crate::expression_tree::{BuiltinFunction, MinMaxOp, OperatorClass}; diff --git a/internal/compiler/llr/item_tree.rs b/internal/compiler/llr/item_tree.rs index c6f5a966848..81740773879 100644 --- a/internal/compiler/llr/item_tree.rs +++ b/internal/compiler/llr/item_tree.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use super::{EvaluationContext, Expression, ParentCtx}; use crate::langtype::{NativeClass, Type}; diff --git a/internal/compiler/llr/lower_expression.rs b/internal/compiler/llr/lower_expression.rs index 55857529eee..06f0aca5ae3 100644 --- a/internal/compiler/llr/lower_expression.rs +++ b/internal/compiler/llr/lower_expression.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::cell::RefCell; use std::collections::{BTreeMap, HashMap}; diff --git a/internal/compiler/llr/lower_to_item_tree.rs b/internal/compiler/llr/lower_to_item_tree.rs index a3d937001e4..244d8e54db3 100644 --- a/internal/compiler/llr/lower_to_item_tree.rs +++ b/internal/compiler/llr/lower_to_item_tree.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use by_address::ByAddress; diff --git a/internal/compiler/llr/optim_passes/count_property_use.rs b/internal/compiler/llr/optim_passes/count_property_use.rs index 65a7d743b92..bbebf394875 100644 --- a/internal/compiler/llr/optim_passes/count_property_use.rs +++ b/internal/compiler/llr/optim_passes/count_property_use.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Passes that fills the Property::use_count //! diff --git a/internal/compiler/llr/optim_passes/inline_expressions.rs b/internal/compiler/llr/optim_passes/inline_expressions.rs index abe1f367ea5..7af6e9ad7c7 100644 --- a/internal/compiler/llr/optim_passes/inline_expressions.rs +++ b/internal/compiler/llr/optim_passes/inline_expressions.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Inline properties that are simple enough to be inlined //! diff --git a/internal/compiler/llr/pretty_print.rs b/internal/compiler/llr/pretty_print.rs index b12e0df110e..f100c7c8fc1 100644 --- a/internal/compiler/llr/pretty_print.rs +++ b/internal/compiler/llr/pretty_print.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::fmt::{Display, Result, Write}; diff --git a/internal/compiler/load_builtins.rs b/internal/compiler/load_builtins.rs index 02fad60933f..7bc925bdbb8 100644 --- a/internal/compiler/load_builtins.rs +++ b/internal/compiler/load_builtins.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! Parse the contents of builtins.slint and fill the builtin type registry diff --git a/internal/compiler/lookup.rs b/internal/compiler/lookup.rs index 8dd0b4ff274..be20e94a55d 100644 --- a/internal/compiler/lookup.rs +++ b/internal/compiler/lookup.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Helper to do lookup in expressions diff --git a/internal/compiler/namedreference.rs b/internal/compiler/namedreference.rs index 8d02e1e0806..e563beaf228 100644 --- a/internal/compiler/namedreference.rs +++ b/internal/compiler/namedreference.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This module contains the [`NamedReference`] and its helper diff --git a/internal/compiler/object_tree.rs b/internal/compiler/object_tree.rs index 6d158ba699c..984b829d53a 100644 --- a/internal/compiler/object_tree.rs +++ b/internal/compiler/object_tree.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This module contains the intermediate representation of the code in the form of an object tree diff --git a/internal/compiler/parser-test-macro/Cargo.toml b/internal/compiler/parser-test-macro/Cargo.toml index 7220ef53344..facd6a66deb 100644 --- a/internal/compiler/parser-test-macro/Cargo.toml +++ b/internal/compiler/parser-test-macro/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "i-slint-parser-test-macro" diff --git a/internal/compiler/parser-test-macro/README.md b/internal/compiler/parser-test-macro/README.md index 51d7f84f89a..623ed103535 100644 --- a/internal/compiler/parser-test-macro/README.md +++ b/internal/compiler/parser-test-macro/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 parser_test: a proc macro attribute that generate tests for the parser functions diff --git a/internal/compiler/parser-test-macro/lib.rs b/internal/compiler/parser-test-macro/lib.rs index e162dc73d6a..ebc4a792e0e 100644 --- a/internal/compiler/parser-test-macro/lib.rs +++ b/internal/compiler/parser-test-macro/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![doc = include_str!("README.md")] #![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")] diff --git a/internal/compiler/parser.rs b/internal/compiler/parser.rs index a5e356af0b6..82a7ddca0e0 100644 --- a/internal/compiler/parser.rs +++ b/internal/compiler/parser.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! The Slint Language Parser diff --git a/internal/compiler/parser/document.rs b/internal/compiler/parser/document.rs index c6ace282f99..d7bcc239b63 100644 --- a/internal/compiler/parser/document.rs +++ b/internal/compiler/parser/document.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use super::element::{parse_element, parse_element_content}; use super::prelude::*; diff --git a/internal/compiler/parser/element.rs b/internal/compiler/parser/element.rs index c27dc7137ab..6022de1061d 100644 --- a/internal/compiler/parser/element.rs +++ b/internal/compiler/parser/element.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! The parser functions for elements and things inside them diff --git a/internal/compiler/parser/expressions.rs b/internal/compiler/parser/expressions.rs index f4cc247d5e6..53a0951130b 100644 --- a/internal/compiler/parser/expressions.rs +++ b/internal/compiler/parser/expressions.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use super::document::parse_qualified_name; use super::prelude::*; diff --git a/internal/compiler/parser/statements.rs b/internal/compiler/parser/statements.rs index cbd111ede24..6bf1f029fbe 100644 --- a/internal/compiler/parser/statements.rs +++ b/internal/compiler/parser/statements.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use super::element::parse_code_block; use super::expressions::parse_expression; diff --git a/internal/compiler/parser/type.rs b/internal/compiler/parser/type.rs index a670c67bce5..d28aa9b6d1c 100644 --- a/internal/compiler/parser/type.rs +++ b/internal/compiler/parser/type.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Module containing the parsing functions for type names diff --git a/internal/compiler/passes.rs b/internal/compiler/passes.rs index f069a050433..40929b858f0 100644 --- a/internal/compiler/passes.rs +++ b/internal/compiler/passes.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 mod apply_default_properties_from_style; mod binding_analysis; diff --git a/internal/compiler/passes/apply_default_properties_from_style.rs b/internal/compiler/passes/apply_default_properties_from_style.rs index 8792e0f2a67..3f824319c90 100644 --- a/internal/compiler/passes/apply_default_properties_from_style.rs +++ b/internal/compiler/passes/apply_default_properties_from_style.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Passe that apply the default property from the style. //! diff --git a/internal/compiler/passes/binding_analysis.rs b/internal/compiler/passes/binding_analysis.rs index e89f78ad264..219ec399cfa 100644 --- a/internal/compiler/passes/binding_analysis.rs +++ b/internal/compiler/passes/binding_analysis.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Compute binding analysis and attempt to find binding loops diff --git a/internal/compiler/passes/border_radius.rs b/internal/compiler/passes/border_radius.rs index e5618462339..072f1498d68 100644 --- a/internal/compiler/passes/border_radius.rs +++ b/internal/compiler/passes/border_radius.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Pass that applies the default border-radius to border-top|bottom-left|right-radius. diff --git a/internal/compiler/passes/check_expressions.rs b/internal/compiler/passes/check_expressions.rs index 769445b5f2a..7821ad664cb 100644 --- a/internal/compiler/passes/check_expressions.rs +++ b/internal/compiler/passes/check_expressions.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::rc::Rc; diff --git a/internal/compiler/passes/check_public_api.rs b/internal/compiler/passes/check_public_api.rs index 54457480e1e..8adcfde6670 100644 --- a/internal/compiler/passes/check_public_api.rs +++ b/internal/compiler/passes/check_public_api.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Pass that check that the public api is ok and mark the property as exposed diff --git a/internal/compiler/passes/check_rotation.rs b/internal/compiler/passes/check_rotation.rs index 7d5596e8102..4b1a1e6ed1e 100644 --- a/internal/compiler/passes/check_rotation.rs +++ b/internal/compiler/passes/check_rotation.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::diagnostics::BuildDiagnostics; use crate::diagnostics::Spanned; diff --git a/internal/compiler/passes/clip.rs b/internal/compiler/passes/clip.rs index 681e4e55be5..8a0654dd3be 100644 --- a/internal/compiler/passes/clip.rs +++ b/internal/compiler/passes/clip.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Pass that lowers synthetic `clip` properties to Clip element diff --git a/internal/compiler/passes/collect_custom_fonts.rs b/internal/compiler/passes/collect_custom_fonts.rs index 2977eac04bb..a0eb4591e34 100644 --- a/internal/compiler/passes/collect_custom_fonts.rs +++ b/internal/compiler/passes/collect_custom_fonts.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Passes that fills the root component used_global diff --git a/internal/compiler/passes/collect_globals.rs b/internal/compiler/passes/collect_globals.rs index 9674b10ae94..f48eca256d8 100644 --- a/internal/compiler/passes/collect_globals.rs +++ b/internal/compiler/passes/collect_globals.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Passes that fills the root component used_types.globals diff --git a/internal/compiler/passes/collect_init_code.rs b/internal/compiler/passes/collect_init_code.rs index 5ff18761314..849f063baf4 100644 --- a/internal/compiler/passes/collect_init_code.rs +++ b/internal/compiler/passes/collect_init_code.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Passe that collects the code from init callbacks from elements and moves it into the component's init_code. diff --git a/internal/compiler/passes/collect_structs_and_enums.rs b/internal/compiler/passes/collect_structs_and_enums.rs index 17b42a50ebf..356ce0c11d4 100644 --- a/internal/compiler/passes/collect_structs_and_enums.rs +++ b/internal/compiler/passes/collect_structs_and_enums.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Passes that fills the root component used_types.structs diff --git a/internal/compiler/passes/collect_subcomponents.rs b/internal/compiler/passes/collect_subcomponents.rs index 5d3b3063bd3..00daf84c2de 100644 --- a/internal/compiler/passes/collect_subcomponents.rs +++ b/internal/compiler/passes/collect_subcomponents.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Passes that fills the root component used_types.sub_components diff --git a/internal/compiler/passes/compile_paths.rs b/internal/compiler/passes/compile_paths.rs index 98b099c73f8..f6290e041db 100644 --- a/internal/compiler/passes/compile_paths.rs +++ b/internal/compiler/passes/compile_paths.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This pass converts the verbose markup used for paths, such as //! Path { diff --git a/internal/compiler/passes/const_propagation.rs b/internal/compiler/passes/const_propagation.rs index 4814148e131..2b138c269de 100644 --- a/internal/compiler/passes/const_propagation.rs +++ b/internal/compiler/passes/const_propagation.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Try to simplify property bindings by propagating constant expressions diff --git a/internal/compiler/passes/deduplicate_property_read.rs b/internal/compiler/passes/deduplicate_property_read.rs index abcf72e047f..3a7c11c0af3 100644 --- a/internal/compiler/passes/deduplicate_property_read.rs +++ b/internal/compiler/passes/deduplicate_property_read.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Do not read twice the same property, store in a local variable instead diff --git a/internal/compiler/passes/default_geometry.rs b/internal/compiler/passes/default_geometry.rs index 0eddfdd7c09..b43caee971b 100644 --- a/internal/compiler/passes/default_geometry.rs +++ b/internal/compiler/passes/default_geometry.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! Set the width and height of Rectangle, TouchArea, ... to 100%, the implicit width or aspect ratio preserving for Images. diff --git a/internal/compiler/passes/embed_glyphs.rs b/internal/compiler/passes/embed_glyphs.rs index 8b0ae7aca54..9c706c88b7d 100644 --- a/internal/compiler/passes/embed_glyphs.rs +++ b/internal/compiler/passes/embed_glyphs.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::diagnostics::BuildDiagnostics; #[cfg(not(target_arch = "wasm32"))] diff --git a/internal/compiler/passes/embed_images.rs b/internal/compiler/passes/embed_images.rs index 6ddde8ba678..ed9dcebf007 100644 --- a/internal/compiler/passes/embed_images.rs +++ b/internal/compiler/passes/embed_images.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::diagnostics::BuildDiagnostics; use crate::embedded_resources::*; diff --git a/internal/compiler/passes/ensure_window.rs b/internal/compiler/passes/ensure_window.rs index 448f96dc14e..49956b04728 100644 --- a/internal/compiler/passes/ensure_window.rs +++ b/internal/compiler/passes/ensure_window.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Make sure that the top level element of the component is always a Window diff --git a/internal/compiler/passes/flickable.rs b/internal/compiler/passes/flickable.rs index 62e5f2d78d0..9cb70234803 100644 --- a/internal/compiler/passes/flickable.rs +++ b/internal/compiler/passes/flickable.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Flickable pass //! diff --git a/internal/compiler/passes/focus_handling.rs b/internal/compiler/passes/focus_handling.rs index 9dbfee5ebde..ff44e01e367 100644 --- a/internal/compiler/passes/focus_handling.rs +++ b/internal/compiler/passes/focus_handling.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This pass follows the forward-focus property on the root element to determine the initial focus item //! as well as handle the forward for `focus()` calls in code. diff --git a/internal/compiler/passes/generate_item_indices.rs b/internal/compiler/passes/generate_item_indices.rs index 9fcd2215836..f1d0b87105a 100644 --- a/internal/compiler/passes/generate_item_indices.rs +++ b/internal/compiler/passes/generate_item_indices.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Assign the Element::item_index on each elements diff --git a/internal/compiler/passes/infer_aliases_types.rs b/internal/compiler/passes/infer_aliases_types.rs index a159b6fea36..7490d23236a 100644 --- a/internal/compiler/passes/infer_aliases_types.rs +++ b/internal/compiler/passes/infer_aliases_types.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Passes that resolve the type of two way bindings. //! diff --git a/internal/compiler/passes/inlining.rs b/internal/compiler/passes/inlining.rs index e814f621335..34f5449168a 100644 --- a/internal/compiler/passes/inlining.rs +++ b/internal/compiler/passes/inlining.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Inline each object_tree::Component within the main Component diff --git a/internal/compiler/passes/lower_absolute_coordinates.rs b/internal/compiler/passes/lower_absolute_coordinates.rs index 4a5a3fb832f..5a14fd20fd1 100644 --- a/internal/compiler/passes/lower_absolute_coordinates.rs +++ b/internal/compiler/passes/lower_absolute_coordinates.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This pass creates bindings to "absolute-y" and "absolute-y" properties //! that can be used to compute the window-absolute coordinates of elements. diff --git a/internal/compiler/passes/lower_accessibility.rs b/internal/compiler/passes/lower_accessibility.rs index 828af9db78b..18d67264f52 100644 --- a/internal/compiler/passes/lower_accessibility.rs +++ b/internal/compiler/passes/lower_accessibility.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Pass that lowers synthetic `accessible-*` properties diff --git a/internal/compiler/passes/lower_component_container.rs b/internal/compiler/passes/lower_component_container.rs index 312d58458f3..f02b11d86bb 100644 --- a/internal/compiler/passes/lower_component_container.rs +++ b/internal/compiler/passes/lower_component_container.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::diagnostics::BuildDiagnostics; use crate::langtype::ElementType; diff --git a/internal/compiler/passes/lower_layout.rs b/internal/compiler/passes/lower_layout.rs index 2837bcdb661..2622c241eb6 100644 --- a/internal/compiler/passes/lower_layout.rs +++ b/internal/compiler/passes/lower_layout.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Passe that compute the layout constraint diff --git a/internal/compiler/passes/lower_popups.rs b/internal/compiler/passes/lower_popups.rs index d746325a719..500491ba738 100644 --- a/internal/compiler/passes/lower_popups.rs +++ b/internal/compiler/passes/lower_popups.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Passe that transform the PopupWindow element into a component diff --git a/internal/compiler/passes/lower_property_to_element.rs b/internal/compiler/passes/lower_property_to_element.rs index 18faf2ae45e..4318251e6ce 100644 --- a/internal/compiler/passes/lower_property_to_element.rs +++ b/internal/compiler/passes/lower_property_to_element.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Pass that lowers synthetic properties such as `opacity` and `layer` properties to their corresponding elements. //! For example `f := Foo { opacity: ; }` is mapped to `Opacity { opacity <=> f.opacity; f := Foo { ... } }` diff --git a/internal/compiler/passes/lower_shadows.rs b/internal/compiler/passes/lower_shadows.rs index 36521d32460..a1e484e69d7 100644 --- a/internal/compiler/passes/lower_shadows.rs +++ b/internal/compiler/passes/lower_shadows.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Pass that lowers synthetic `drop-shadow-*` properties to proper shadow elements // At the moment only shadows on `Rectangle` elements are supported, i.e. the drop shadow diff --git a/internal/compiler/passes/lower_states.rs b/internal/compiler/passes/lower_states.rs index d7c6eba8821..f6d311f8a1f 100644 --- a/internal/compiler/passes/lower_states.rs +++ b/internal/compiler/passes/lower_states.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Pass that create a state property, and change all the binding to depend on that property diff --git a/internal/compiler/passes/lower_tabwidget.rs b/internal/compiler/passes/lower_tabwidget.rs index 48bf441de0f..9221ef01c06 100644 --- a/internal/compiler/passes/lower_tabwidget.rs +++ b/internal/compiler/passes/lower_tabwidget.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore tabwidget diff --git a/internal/compiler/passes/lower_text_input_interface.rs b/internal/compiler/passes/lower_text_input_interface.rs index dda0d9697ba..39f974c1cc6 100644 --- a/internal/compiler/passes/lower_text_input_interface.rs +++ b/internal/compiler/passes/lower_text_input_interface.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Passe lower the access to the global TextInputInterface.text-input-focused to getter or setter. diff --git a/internal/compiler/passes/materialize_fake_properties.rs b/internal/compiler/passes/materialize_fake_properties.rs index fbec4ec34e4..3f6f1d9f29a 100644 --- a/internal/compiler/passes/materialize_fake_properties.rs +++ b/internal/compiler/passes/materialize_fake_properties.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This pass creates properties that are used but are otherwise not real. //! diff --git a/internal/compiler/passes/move_declarations.rs b/internal/compiler/passes/move_declarations.rs index bd2f2d1988e..e2f2e8b3e80 100644 --- a/internal/compiler/passes/move_declarations.rs +++ b/internal/compiler/passes/move_declarations.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This pass moves all declaration of properties or callback to the root diff --git a/internal/compiler/passes/optimize_useless_rectangles.rs b/internal/compiler/passes/optimize_useless_rectangles.rs index 40071b60532..359161d8c96 100644 --- a/internal/compiler/passes/optimize_useless_rectangles.rs +++ b/internal/compiler/passes/optimize_useless_rectangles.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Remove the rectangles that serves no purposes //! diff --git a/internal/compiler/passes/purity_check.rs b/internal/compiler/passes/purity_check.rs index 91454fa8a5f..25d7f55a784 100644 --- a/internal/compiler/passes/purity_check.rs +++ b/internal/compiler/passes/purity_check.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::diagnostics::BuildDiagnostics; use crate::expression_tree::Expression; diff --git a/internal/compiler/passes/remove_aliases.rs b/internal/compiler/passes/remove_aliases.rs index eef551a0c48..92213d917b3 100644 --- a/internal/compiler/passes/remove_aliases.rs +++ b/internal/compiler/passes/remove_aliases.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This pass removes the property used in a two ways bindings diff --git a/internal/compiler/passes/remove_return.rs b/internal/compiler/passes/remove_return.rs index 45efc9e165a..f37b55c474f 100644 --- a/internal/compiler/passes/remove_return.rs +++ b/internal/compiler/passes/remove_return.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::collections::{BTreeMap, HashMap}; diff --git a/internal/compiler/passes/remove_unused_properties.rs b/internal/compiler/passes/remove_unused_properties.rs index 7ee1d1b8943..b84d261069c 100644 --- a/internal/compiler/passes/remove_unused_properties.rs +++ b/internal/compiler/passes/remove_unused_properties.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Remove the properties which are not used diff --git a/internal/compiler/passes/repeater_component.rs b/internal/compiler/passes/repeater_component.rs index 475e3fc5822..d0884107207 100644 --- a/internal/compiler/passes/repeater_component.rs +++ b/internal/compiler/passes/repeater_component.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! Make sure that the Repeated expression are just components without any children diff --git a/internal/compiler/passes/resolve_native_classes.rs b/internal/compiler/passes/resolve_native_classes.rs index ca43f119dec..55306069f33 100644 --- a/internal/compiler/passes/resolve_native_classes.rs +++ b/internal/compiler/passes/resolve_native_classes.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! After inlining and moving declarations, all Element::base_type should be Type::BuiltinElement. This pass resolves them //! to NativeClass and picking a variant that only contains the used properties. diff --git a/internal/compiler/passes/resolving.rs b/internal/compiler/passes/resolving.rs index c3353037dd2..35686549f79 100644 --- a/internal/compiler/passes/resolving.rs +++ b/internal/compiler/passes/resolving.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Passes that resolve the property binding expression. //! diff --git a/internal/compiler/passes/unique_id.rs b/internal/compiler/passes/unique_id.rs index 2f4288469cb..43cba2c377d 100644 --- a/internal/compiler/passes/unique_id.rs +++ b/internal/compiler/passes/unique_id.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::diagnostics::BuildDiagnostics; use crate::langtype::ElementType; diff --git a/internal/compiler/passes/visible.rs b/internal/compiler/passes/visible.rs index 37470723cb7..b381fdc9127 100644 --- a/internal/compiler/passes/visible.rs +++ b/internal/compiler/passes/visible.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Pass that lowers synthetic `visible` properties to Clip element diff --git a/internal/compiler/passes/z_order.rs b/internal/compiler/passes/z_order.rs index 13563a8105f..8e3972abcac 100644 --- a/internal/compiler/passes/z_order.rs +++ b/internal/compiler/passes/z_order.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! re-order the children by their z-order */ diff --git a/internal/compiler/pathutils.rs b/internal/compiler/pathutils.rs index 10918726a4e..2d781745ec3 100644 --- a/internal/compiler/pathutils.rs +++ b/internal/compiler/pathutils.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Reimplement some Path handling code: The one in `std` is not available //! when running in WASM! diff --git a/internal/compiler/tests/consistent_styles.rs b/internal/compiler/tests/consistent_styles.rs index 41fb7d51920..98aa5f90d75 100644 --- a/internal/compiler/tests/consistent_styles.rs +++ b/internal/compiler/tests/consistent_styles.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Test that all styles have the same API. diff --git a/internal/compiler/tests/syntax/accessibility/accessible_properties.slint b/internal/compiler/tests/syntax/accessibility/accessible_properties.slint index 5c7bce159fa..25c033c6c52 100644 --- a/internal/compiler/tests/syntax/accessibility/accessible_properties.slint +++ b/internal/compiler/tests/syntax/accessibility/accessible_properties.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Button1 := Rectangle { property cond; diff --git a/internal/compiler/tests/syntax/analysis/binding_loop1.slint b/internal/compiler/tests/syntax/analysis/binding_loop1.slint index f8d4d537a9b..9299c22a963 100644 --- a/internal/compiler/tests/syntax/analysis/binding_loop1.slint +++ b/internal/compiler/tests/syntax/analysis/binding_loop1.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 WithStates := Rectangle { diff --git a/internal/compiler/tests/syntax/analysis/binding_loop2.slint b/internal/compiler/tests/syntax/analysis/binding_loop2.slint index 5e3066ea6e7..8d156d72e92 100644 --- a/internal/compiler/tests/syntax/analysis/binding_loop2.slint +++ b/internal/compiler/tests/syntax/analysis/binding_loop2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 T1 := Rectangle { diff --git a/internal/compiler/tests/syntax/analysis/binding_loop_function.slint b/internal/compiler/tests/syntax/analysis/binding_loop_function.slint index efd7959b540..c25d7c9a899 100644 --- a/internal/compiler/tests/syntax/analysis/binding_loop_function.slint +++ b/internal/compiler/tests/syntax/analysis/binding_loop_function.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Compo1 := Rectangle { diff --git a/internal/compiler/tests/syntax/analysis/binding_loop_issue_772.slint b/internal/compiler/tests/syntax/analysis/binding_loop_issue_772.slint index 9a7901c80a9..c05a53533f0 100644 --- a/internal/compiler/tests/syntax/analysis/binding_loop_issue_772.slint +++ b/internal/compiler/tests/syntax/analysis/binding_loop_issue_772.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Alias := Rectangle { property viewport_width ; diff --git a/internal/compiler/tests/syntax/analysis/binding_loop_layout.slint b/internal/compiler/tests/syntax/analysis/binding_loop_layout.slint index cd38b9e8ef5..43c92ec093e 100644 --- a/internal/compiler/tests/syntax/analysis/binding_loop_layout.slint +++ b/internal/compiler/tests/syntax/analysis/binding_loop_layout.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TC := Rectangle { // ^error{The binding for the property 'layoutinfo-h' is part of a binding loop} diff --git a/internal/compiler/tests/syntax/analysis/binding_loop_layout2.slint b/internal/compiler/tests/syntax/analysis/binding_loop_layout2.slint index 33a53038901..efe42f6b565 100644 --- a/internal/compiler/tests/syntax/analysis/binding_loop_layout2.slint +++ b/internal/compiler/tests/syntax/analysis/binding_loop_layout2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Wrap := Rectangle { property woo <=> text.wrap; diff --git a/internal/compiler/tests/syntax/analysis/binding_loop_layout3.slint b/internal/compiler/tests/syntax/analysis/binding_loop_layout3.slint index 2f9578c96dc..eeeeacaf30e 100644 --- a/internal/compiler/tests/syntax/analysis/binding_loop_layout3.slint +++ b/internal/compiler/tests/syntax/analysis/binding_loop_layout3.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Compo := Rectangle { // ^error{The binding for the property 'layoutinfo-h' is part of a binding loop} diff --git a/internal/compiler/tests/syntax/analysis/binding_loop_layout4.slint b/internal/compiler/tests/syntax/analysis/binding_loop_layout4.slint index 198c2279a42..f2cdcc1af3f 100644 --- a/internal/compiler/tests/syntax/analysis/binding_loop_layout4.slint +++ b/internal/compiler/tests/syntax/analysis/binding_loop_layout4.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component Foo { // ^error{The binding for the property 'layoutinfo-h' is part of a binding loop} diff --git a/internal/compiler/tests/syntax/analysis/binding_loop_mappointtowindow.slint b/internal/compiler/tests/syntax/analysis/binding_loop_mappointtowindow.slint index e9170195452..6d9789d78ef 100644 --- a/internal/compiler/tests/syntax/analysis/binding_loop_mappointtowindow.slint +++ b/internal/compiler/tests/syntax/analysis/binding_loop_mappointtowindow.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export App := Rectangle { diff --git a/internal/compiler/tests/syntax/analysis/binding_loop_self.slint b/internal/compiler/tests/syntax/analysis/binding_loop_self.slint index 46ae17c1e57..4af9a24105d 100644 --- a/internal/compiler/tests/syntax/analysis/binding_loop_self.slint +++ b/internal/compiler/tests/syntax/analysis/binding_loop_self.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // From issue #737 diff --git a/internal/compiler/tests/syntax/basic/animate.slint b/internal/compiler/tests/syntax/basic/animate.slint index 183d42779c3..4c352892b89 100644 --- a/internal/compiler/tests/syntax/basic/animate.slint +++ b/internal/compiler/tests/syntax/basic/animate.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export SuperSimple := Rectangle { diff --git a/internal/compiler/tests/syntax/basic/array.slint b/internal/compiler/tests/syntax/basic/array.slint index f78e26581fa..67f62f34da2 100644 --- a/internal/compiler/tests/syntax/basic/array.slint +++ b/internal/compiler/tests/syntax/basic/array.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Test := Window { a: [,]; diff --git a/internal/compiler/tests/syntax/basic/assign.slint b/internal/compiler/tests/syntax/basic/assign.slint index dcf09024f26..7489685cb9f 100644 --- a/internal/compiler/tests/syntax/basic/assign.slint +++ b/internal/compiler/tests/syntax/basic/assign.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export SuperSimple := Rectangle { TouchArea { diff --git a/internal/compiler/tests/syntax/basic/box_shadow.slint b/internal/compiler/tests/syntax/basic/box_shadow.slint index 938ce7eba54..d7df4408a81 100644 --- a/internal/compiler/tests/syntax/basic/box_shadow.slint +++ b/internal/compiler/tests/syntax/basic/box_shadow.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Foo := Rectangle { drop-shadow-color: red; diff --git a/internal/compiler/tests/syntax/basic/children_placeholder.slint b/internal/compiler/tests/syntax/basic/children_placeholder.slint index 096f8b10078..f473ba05b14 100644 --- a/internal/compiler/tests/syntax/basic/children_placeholder.slint +++ b/internal/compiler/tests/syntax/basic/children_placeholder.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export NotInIf := Rectangle { if true: Rectangle { diff --git a/internal/compiler/tests/syntax/basic/children_placeholder_2.slint b/internal/compiler/tests/syntax/basic/children_placeholder_2.slint index a72afae43e2..a6ac5cbd536 100644 --- a/internal/compiler/tests/syntax/basic/children_placeholder_2.slint +++ b/internal/compiler/tests/syntax/basic/children_placeholder_2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Final := Window { VerticalLayout { diff --git a/internal/compiler/tests/syntax/basic/clip.slint b/internal/compiler/tests/syntax/basic/clip.slint index 67a61823d0f..c40f5569192 100644 --- a/internal/compiler/tests/syntax/basic/clip.slint +++ b/internal/compiler/tests/syntax/basic/clip.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 MyTouchArea := TouchArea { } diff --git a/internal/compiler/tests/syntax/basic/comments.slint b/internal/compiler/tests/syntax/basic/comments.slint index acc7c8759a7..69e849aa53e 100644 --- a/internal/compiler/tests/syntax/basic/comments.slint +++ b/internal/compiler/tests/syntax/basic/comments.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // comment diff --git a/internal/compiler/tests/syntax/basic/dialog.slint b/internal/compiler/tests/syntax/basic/dialog.slint index 0ca509fdd91..e59359d8749 100644 --- a/internal/compiler/tests/syntax/basic/dialog.slint +++ b/internal/compiler/tests/syntax/basic/dialog.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StandardButton } from "std-widgets.slint"; diff --git a/internal/compiler/tests/syntax/basic/dialog2.slint b/internal/compiler/tests/syntax/basic/dialog2.slint index acb03b66f52..048dbc9c73f 100644 --- a/internal/compiler/tests/syntax/basic/dialog2.slint +++ b/internal/compiler/tests/syntax/basic/dialog2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StandardButton } from "std-widgets.slint"; diff --git a/internal/compiler/tests/syntax/basic/double_binding.slint b/internal/compiler/tests/syntax/basic/double_binding.slint index 6b543f54416..632a35e1b45 100644 --- a/internal/compiler/tests/syntax/basic/double_binding.slint +++ b/internal/compiler/tests/syntax/basic/double_binding.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export X := Rectangle { diff --git a/internal/compiler/tests/syntax/basic/double_color.slint b/internal/compiler/tests/syntax/basic/double_color.slint index f4afa6cf03c..f28e241c198 100644 --- a/internal/compiler/tests/syntax/basic/double_color.slint +++ b/internal/compiler/tests/syntax/basic/double_color.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export SuperSimple := Rectangle { diff --git a/internal/compiler/tests/syntax/basic/duplicated_id.slint b/internal/compiler/tests/syntax/basic/duplicated_id.slint index 70efbb41797..8abf7e0f1c5 100644 --- a/internal/compiler/tests/syntax/basic/duplicated_id.slint +++ b/internal/compiler/tests/syntax/basic/duplicated_id.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 SubElement := Rectangle { diff --git a/internal/compiler/tests/syntax/basic/easing.slint b/internal/compiler/tests/syntax/basic/easing.slint index 2c106f6345a..3abebb102ec 100644 --- a/internal/compiler/tests/syntax/basic/easing.slint +++ b/internal/compiler/tests/syntax/basic/easing.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export X := Rectangle { animate x { easing: ease-in; } diff --git a/internal/compiler/tests/syntax/basic/easing_not_called.slint b/internal/compiler/tests/syntax/basic/easing_not_called.slint index 0b18cf0416e..3a94a632853 100644 --- a/internal/compiler/tests/syntax/basic/easing_not_called.slint +++ b/internal/compiler/tests/syntax/basic/easing_not_called.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Cannot be put in the easing.slint test because it is in a different pass diff --git a/internal/compiler/tests/syntax/basic/empty.slint b/internal/compiler/tests/syntax/basic/empty.slint index 14582f41475..38ad4cd44d7 100644 --- a/internal/compiler/tests/syntax/basic/empty.slint +++ b/internal/compiler/tests/syntax/basic/empty.slint @@ -1,2 +1,6 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 diff --git a/internal/compiler/tests/syntax/basic/enums.slint b/internal/compiler/tests/syntax/basic/enums.slint index 6de30dcbcf1..176c25c77da 100644 --- a/internal/compiler/tests/syntax/basic/enums.slint +++ b/internal/compiler/tests/syntax/basic/enums.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 enum Xyz { hello-hello, diff --git a/internal/compiler/tests/syntax/basic/for.slint b/internal/compiler/tests/syntax/basic/for.slint index 255b3958026..ba6e1e4f6ce 100644 --- a/internal/compiler/tests/syntax/basic/for.slint +++ b/internal/compiler/tests/syntax/basic/for.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export SuperSimple := Rectangle { diff --git a/internal/compiler/tests/syntax/basic/image.slint b/internal/compiler/tests/syntax/basic/image.slint index d716a14db5d..4ae7d48016e 100644 --- a/internal/compiler/tests/syntax/basic/image.slint +++ b/internal/compiler/tests/syntax/basic/image.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export SubElements := Rectangle { diff --git a/internal/compiler/tests/syntax/basic/inline_component.slint b/internal/compiler/tests/syntax/basic/inline_component.slint index 53f78574605..89cf37972be 100644 --- a/internal/compiler/tests/syntax/basic/inline_component.slint +++ b/internal/compiler/tests/syntax/basic/inline_component.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Inline1 := Rectangle { Rectangle { diff --git a/internal/compiler/tests/syntax/basic/item_as_property.slint b/internal/compiler/tests/syntax/basic/item_as_property.slint index e592ac7d64e..a168f6d19a6 100644 --- a/internal/compiler/tests/syntax/basic/item_as_property.slint +++ b/internal/compiler/tests/syntax/basic/item_as_property.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 struct Str := { foo: Rectangle } // ^error{'Rectangle' is not a valid type} diff --git a/internal/compiler/tests/syntax/basic/layout.slint b/internal/compiler/tests/syntax/basic/layout.slint index e43ca0eea69..57b317fc0bf 100644 --- a/internal/compiler/tests/syntax/basic/layout.slint +++ b/internal/compiler/tests/syntax/basic/layout.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export X := Rectangle { diff --git a/internal/compiler/tests/syntax/basic/layout2.slint b/internal/compiler/tests/syntax/basic/layout2.slint index a5e321814a2..f0c918515fd 100644 --- a/internal/compiler/tests/syntax/basic/layout2.slint +++ b/internal/compiler/tests/syntax/basic/layout2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export X := Rectangle { diff --git a/internal/compiler/tests/syntax/basic/linear-gradient.slint b/internal/compiler/tests/syntax/basic/linear-gradient.slint index 5fe2b1306f8..bc48a9ebd86 100644 --- a/internal/compiler/tests/syntax/basic/linear-gradient.slint +++ b/internal/compiler/tests/syntax/basic/linear-gradient.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export X := Rectangle { property g1: @linear-gradient(); diff --git a/internal/compiler/tests/syntax/basic/object_in_binding.slint b/internal/compiler/tests/syntax/basic/object_in_binding.slint index a10663b9433..12330c7005f 100644 --- a/internal/compiler/tests/syntax/basic/object_in_binding.slint +++ b/internal/compiler/tests/syntax/basic/object_in_binding.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export H := Rectangle { x: {foo: "42"}; diff --git a/internal/compiler/tests/syntax/basic/opacity.slint b/internal/compiler/tests/syntax/basic/opacity.slint index 692c4aab8a6..a566c1d3947 100644 --- a/internal/compiler/tests/syntax/basic/opacity.slint +++ b/internal/compiler/tests/syntax/basic/opacity.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export SuperSimple := Window { diff --git a/internal/compiler/tests/syntax/basic/parse_error.slint b/internal/compiler/tests/syntax/basic/parse_error.slint index a533cf5bc00..aec396cab6c 100644 --- a/internal/compiler/tests/syntax/basic/parse_error.slint +++ b/internal/compiler/tests/syntax/basic/parse_error.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export SuperSimple := Rectangle { 88; diff --git a/internal/compiler/tests/syntax/basic/path.slint b/internal/compiler/tests/syntax/basic/path.slint index a8e2a0326da..564995bd8bc 100644 --- a/internal/compiler/tests/syntax/basic/path.slint +++ b/internal/compiler/tests/syntax/basic/path.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Rectangle { diff --git a/internal/compiler/tests/syntax/basic/path_commands.slint b/internal/compiler/tests/syntax/basic/path_commands.slint index bafc30c1ae5..0d498326990 100644 --- a/internal/compiler/tests/syntax/basic/path_commands.slint +++ b/internal/compiler/tests/syntax/basic/path_commands.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Test2 := Path { width: 640px; diff --git a/internal/compiler/tests/syntax/basic/path_for.slint b/internal/compiler/tests/syntax/basic/path_for.slint index d0b2676a397..34b4e34054b 100644 --- a/internal/compiler/tests/syntax/basic/path_for.slint +++ b/internal/compiler/tests/syntax/basic/path_for.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Rectangle { diff --git a/internal/compiler/tests/syntax/basic/percent.slint b/internal/compiler/tests/syntax/basic/percent.slint index f9e12167c59..78a050a22d0 100644 --- a/internal/compiler/tests/syntax/basic/percent.slint +++ b/internal/compiler/tests/syntax/basic/percent.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Foo := Rectangle { width: 30%; diff --git a/internal/compiler/tests/syntax/basic/popup.slint b/internal/compiler/tests/syntax/basic/popup.slint index 7112934493f..e007b90c2b3 100644 --- a/internal/compiler/tests/syntax/basic/popup.slint +++ b/internal/compiler/tests/syntax/basic/popup.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export X := PopupWindow { diff --git a/internal/compiler/tests/syntax/basic/property_animation.slint b/internal/compiler/tests/syntax/basic/property_animation.slint index d84d7c96b2f..f2061b50594 100644 --- a/internal/compiler/tests/syntax/basic/property_animation.slint +++ b/internal/compiler/tests/syntax/basic/property_animation.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Rectangle { animate x { diff --git a/internal/compiler/tests/syntax/basic/property_declaration.slint b/internal/compiler/tests/syntax/basic/property_declaration.slint index f0a57997fcc..6722b6f8652 100644 --- a/internal/compiler/tests/syntax/basic/property_declaration.slint +++ b/internal/compiler/tests/syntax/basic/property_declaration.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Comp := Rectangle { callback pressed; diff --git a/internal/compiler/tests/syntax/basic/property_declaration_in_component.slint b/internal/compiler/tests/syntax/basic/property_declaration_in_component.slint index 0d0c9a36f17..4b5e56bacf4 100644 --- a/internal/compiler/tests/syntax/basic/property_declaration_in_component.slint +++ b/internal/compiler/tests/syntax/basic/property_declaration_in_component.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Comp := Rectangle { property prop; diff --git a/internal/compiler/tests/syntax/basic/radial-gradient.slint b/internal/compiler/tests/syntax/basic/radial-gradient.slint index 74bdb6fe1eb..280db6b7830 100644 --- a/internal/compiler/tests/syntax/basic/radial-gradient.slint +++ b/internal/compiler/tests/syntax/basic/radial-gradient.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export X := Rectangle { property g1: @radial-gradient(); diff --git a/internal/compiler/tests/syntax/basic/return.slint b/internal/compiler/tests/syntax/basic/return.slint index 77fc4e85f3d..c5c02b2aff2 100644 --- a/internal/compiler/tests/syntax/basic/return.slint +++ b/internal/compiler/tests/syntax/basic/return.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export X := Rectangle { background: { diff --git a/internal/compiler/tests/syntax/basic/rotation.slint b/internal/compiler/tests/syntax/basic/rotation.slint index bae5e079330..d88f5fb1e18 100644 --- a/internal/compiler/tests/syntax/basic/rotation.slint +++ b/internal/compiler/tests/syntax/basic/rotation.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Ex1 := Rectangle { Rectangle { diff --git a/internal/compiler/tests/syntax/basic/rust-attr.slint b/internal/compiler/tests/syntax/basic/rust-attr.slint index 247da5b0a89..1dbec31fd41 100644 --- a/internal/compiler/tests/syntax/basic/rust-attr.slint +++ b/internal/compiler/tests/syntax/basic/rust-attr.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 @rust-attr(...) component Foo {} diff --git a/internal/compiler/tests/syntax/basic/self_assign.slint b/internal/compiler/tests/syntax/basic/self_assign.slint index 1f357179df7..ae5531eea17 100644 --- a/internal/compiler/tests/syntax/basic/self_assign.slint +++ b/internal/compiler/tests/syntax/basic/self_assign.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export SuperSimple := Rectangle { TouchArea { diff --git a/internal/compiler/tests/syntax/basic/signal.slint b/internal/compiler/tests/syntax/basic/signal.slint index 45c4e93fa8c..617e62aaf99 100644 --- a/internal/compiler/tests/syntax/basic/signal.slint +++ b/internal/compiler/tests/syntax/basic/signal.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Base := Rectangle { callback blah; diff --git a/internal/compiler/tests/syntax/basic/states_transitions.slint b/internal/compiler/tests/syntax/basic/states_transitions.slint index 699df8d5f7a..288db5549f4 100644 --- a/internal/compiler/tests/syntax/basic/states_transitions.slint +++ b/internal/compiler/tests/syntax/basic/states_transitions.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Rectangle { property checked; diff --git a/internal/compiler/tests/syntax/basic/states_transitions2.slint b/internal/compiler/tests/syntax/basic/states_transitions2.slint index 59cc231474b..5b6842ba3ee 100644 --- a/internal/compiler/tests/syntax/basic/states_transitions2.slint +++ b/internal/compiler/tests/syntax/basic/states_transitions2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Rectangle { property checked; diff --git a/internal/compiler/tests/syntax/basic/states_transitions3.slint b/internal/compiler/tests/syntax/basic/states_transitions3.slint index 54cc6a3d43f..02024dbfd40 100644 --- a/internal/compiler/tests/syntax/basic/states_transitions3.slint +++ b/internal/compiler/tests/syntax/basic/states_transitions3.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Demo := Window { diff --git a/internal/compiler/tests/syntax/basic/states_two_way.slint b/internal/compiler/tests/syntax/basic/states_two_way.slint index 0690d29792e..4ab766a4c0a 100644 --- a/internal/compiler/tests/syntax/basic/states_two_way.slint +++ b/internal/compiler/tests/syntax/basic/states_two_way.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Demo := Window { diff --git a/internal/compiler/tests/syntax/basic/sub_elements.slint b/internal/compiler/tests/syntax/basic/sub_elements.slint index 241879cd125..5ccfe1f4d75 100644 --- a/internal/compiler/tests/syntax/basic/sub_elements.slint +++ b/internal/compiler/tests/syntax/basic/sub_elements.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export SubElements := Rectangle { diff --git a/internal/compiler/tests/syntax/basic/supersimple.slint b/internal/compiler/tests/syntax/basic/supersimple.slint index 27ae39cb8a4..31b76e5e935 100644 --- a/internal/compiler/tests/syntax/basic/supersimple.slint +++ b/internal/compiler/tests/syntax/basic/supersimple.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export SuperSimple := Rectangle { diff --git a/internal/compiler/tests/syntax/basic/svg_path.slint b/internal/compiler/tests/syntax/basic/svg_path.slint index f3e7b82e513..e4f2ba4e62c 100644 --- a/internal/compiler/tests/syntax/basic/svg_path.slint +++ b/internal/compiler/tests/syntax/basic/svg_path.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Rectangle { diff --git a/internal/compiler/tests/syntax/basic/tr.slint b/internal/compiler/tests/syntax/basic/tr.slint index 4b73459d68f..0c2380f86b5 100644 --- a/internal/compiler/tests/syntax/basic/tr.slint +++ b/internal/compiler/tests/syntax/basic/tr.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component X { property t1: @tr(boo); diff --git a/internal/compiler/tests/syntax/basic/tr2.slint b/internal/compiler/tests/syntax/basic/tr2.slint index 509d15069a2..e58546ce9f7 100644 --- a/internal/compiler/tests/syntax/basic/tr2.slint +++ b/internal/compiler/tests/syntax/basic/tr2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component X { property t1: @tr("fo{}oo", 42px); diff --git a/internal/compiler/tests/syntax/basic/type_declaration.slint b/internal/compiler/tests/syntax/basic/type_declaration.slint index 47968c938ef..5dd67978967 100644 --- a/internal/compiler/tests/syntax/basic/type_declaration.slint +++ b/internal/compiler/tests/syntax/basic/type_declaration.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 global MyType := { property aaa; diff --git a/internal/compiler/tests/syntax/basic/unknown_item.slint b/internal/compiler/tests/syntax/basic/unknown_item.slint index 4a035210195..fc056104fa4 100644 --- a/internal/compiler/tests/syntax/basic/unknown_item.slint +++ b/internal/compiler/tests/syntax/basic/unknown_item.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 struct Struct := { def: int, } diff --git a/internal/compiler/tests/syntax/callbacks/init.slint b/internal/compiler/tests/syntax/callbacks/init.slint index 98dafb84a59..1f7c4d8f0b9 100644 --- a/internal/compiler/tests/syntax/callbacks/init.slint +++ b/internal/compiler/tests/syntax/callbacks/init.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 global Singleton := { callback init; diff --git a/internal/compiler/tests/syntax/elements/component_container.slint b/internal/compiler/tests/syntax/elements/component_container.slint index 2c6d3695996..607cf244203 100644 --- a/internal/compiler/tests/syntax/elements/component_container.slint +++ b/internal/compiler/tests/syntax/elements/component_container.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component Foo inherits Rectangle { ComponentContainer { diff --git a/internal/compiler/tests/syntax/elements/listview.slint b/internal/compiler/tests/syntax/elements/listview.slint index 11b3d6115ea..2091dd04568 100644 --- a/internal/compiler/tests/syntax/elements/listview.slint +++ b/internal/compiler/tests/syntax/elements/listview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ListView } from "std-widgets.slint"; diff --git a/internal/compiler/tests/syntax/elements/popup.slint b/internal/compiler/tests/syntax/elements/popup.slint index 3920fb7c80a..5e802eacfbb 100644 --- a/internal/compiler/tests/syntax/elements/popup.slint +++ b/internal/compiler/tests/syntax/elements/popup.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component Bar { diff --git a/internal/compiler/tests/syntax/elements/tabwidget.slint b/internal/compiler/tests/syntax/elements/tabwidget.slint index 6641edc32fb..42914a7a0d9 100644 --- a/internal/compiler/tests/syntax/elements/tabwidget.slint +++ b/internal/compiler/tests/syntax/elements/tabwidget.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { TabWidget } from "std-widgets.slint"; export Test1 := Rectangle { diff --git a/internal/compiler/tests/syntax/elements/tabwidget2.slint b/internal/compiler/tests/syntax/elements/tabwidget2.slint index bdfed2b5f75..4bd82531d3a 100644 --- a/internal/compiler/tests/syntax/elements/tabwidget2.slint +++ b/internal/compiler/tests/syntax/elements/tabwidget2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { TabWidget } from "std-widgets.slint"; diff --git a/internal/compiler/tests/syntax/elements/tabwidget3.slint b/internal/compiler/tests/syntax/elements/tabwidget3.slint index f5b1e2aacc2..54d229b1efb 100644 --- a/internal/compiler/tests/syntax/elements/tabwidget3.slint +++ b/internal/compiler/tests/syntax/elements/tabwidget3.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Test3 := Rectangle { TabWidget { diff --git a/internal/compiler/tests/syntax/exports/export_duplicates.slint b/internal/compiler/tests/syntax/exports/export_duplicates.slint index bc46bd18910..9979209f976 100644 --- a/internal/compiler/tests/syntax/exports/export_duplicates.slint +++ b/internal/compiler/tests/syntax/exports/export_duplicates.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Foo := Rectangle {} Bar := Rectangle {} diff --git a/internal/compiler/tests/syntax/exports/reexport_duplicate.slint b/internal/compiler/tests/syntax/exports/reexport_duplicate.slint index eda56e8f7e1..579694f1e10 100644 --- a/internal/compiler/tests/syntax/exports/reexport_duplicate.slint +++ b/internal/compiler/tests/syntax/exports/reexport_duplicate.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export * from "../../typeloader/incpath/local_helper_type.slint"; // ^warning{'SomeRect' is already exported in this file; it will not be re-exported} diff --git a/internal/compiler/tests/syntax/exports/root_compo_export.slint b/internal/compiler/tests/syntax/exports/root_compo_export.slint index 90b71a75de1..dde01281dc0 100644 --- a/internal/compiler/tests/syntax/exports/root_compo_export.slint +++ b/internal/compiler/tests/syntax/exports/root_compo_export.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component Button { diff --git a/internal/compiler/tests/syntax/exports/root_compo_export2.slint b/internal/compiler/tests/syntax/exports/root_compo_export2.slint index 2471992ea99..1b2949e0310 100644 --- a/internal/compiler/tests/syntax/exports/root_compo_export2.slint +++ b/internal/compiler/tests/syntax/exports/root_compo_export2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component App { //^warning{Component is implicitly marked for export. This is deprecated and it should be explicitly exported} diff --git a/internal/compiler/tests/syntax/exports/single_global_missing_export.slint b/internal/compiler/tests/syntax/exports/single_global_missing_export.slint index 72d6d4cdf95..b7c86d81115 100644 --- a/internal/compiler/tests/syntax/exports/single_global_missing_export.slint +++ b/internal/compiler/tests/syntax/exports/single_global_missing_export.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 global Settings { //^warning{Global singleton is implicitly marked for export. This is deprecated and it should be explicitly exported} diff --git a/internal/compiler/tests/syntax/exports/unused_compo.slint b/internal/compiler/tests/syntax/exports/unused_compo.slint index 215efab2a68..44c446aa2e3 100644 --- a/internal/compiler/tests/syntax/exports/unused_compo.slint +++ b/internal/compiler/tests/syntax/exports/unused_compo.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component Used { } diff --git a/internal/compiler/tests/syntax/expressions/arithmetic_op.slint b/internal/compiler/tests/syntax/expressions/arithmetic_op.slint index 97c7ebb7e3f..96221198a01 100644 --- a/internal/compiler/tests/syntax/expressions/arithmetic_op.slint +++ b/internal/compiler/tests/syntax/expressions/arithmetic_op.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export SuperSimple := Rectangle { property p1: 3s + 1ms; diff --git a/internal/compiler/tests/syntax/expressions/clamp.slint b/internal/compiler/tests/syntax/expressions/clamp.slint index d677abd66a7..5393f815656 100644 --- a/internal/compiler/tests/syntax/expressions/clamp.slint +++ b/internal/compiler/tests/syntax/expressions/clamp.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component SuperSimple { property ok1: clamp(42, 42, 42); diff --git a/internal/compiler/tests/syntax/expressions/comparison_operator.slint b/internal/compiler/tests/syntax/expressions/comparison_operator.slint index a692996cbea..77d9a09d5b1 100644 --- a/internal/compiler/tests/syntax/expressions/comparison_operator.slint +++ b/internal/compiler/tests/syntax/expressions/comparison_operator.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export SuperSimple := Rectangle { property zz: aa > bb == cc diff --git a/internal/compiler/tests/syntax/expressions/condition_operator.slint b/internal/compiler/tests/syntax/expressions/condition_operator.slint index bb1276fde29..b63d99626c3 100644 --- a/internal/compiler/tests/syntax/expressions/condition_operator.slint +++ b/internal/compiler/tests/syntax/expressions/condition_operator.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export SuperSimple := Rectangle { background: area.pressed ? green : blue; diff --git a/internal/compiler/tests/syntax/expressions/image-url.slint b/internal/compiler/tests/syntax/expressions/image-url.slint index a942a2f0406..5944cae04f4 100644 --- a/internal/compiler/tests/syntax/expressions/image-url.slint +++ b/internal/compiler/tests/syntax/expressions/image-url.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component SuperSimple { property i1: @image-url("hello.png"); diff --git a/internal/compiler/tests/syntax/expressions/image-url2.slint b/internal/compiler/tests/syntax/expressions/image-url2.slint index 1e04235082d..13252afd098 100644 --- a/internal/compiler/tests/syntax/expressions/image-url2.slint +++ b/internal/compiler/tests/syntax/expressions/image-url2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component SuperSimple { property i17: @image-url("foo", nine-slice(1px)); diff --git a/internal/compiler/tests/syntax/expressions/minmax.slint b/internal/compiler/tests/syntax/expressions/minmax.slint index 80a5bfa66f2..8453e0dd296 100644 --- a/internal/compiler/tests/syntax/expressions/minmax.slint +++ b/internal/compiler/tests/syntax/expressions/minmax.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 global Plop := { property x: max; diff --git a/internal/compiler/tests/syntax/expressions/percent2.slint b/internal/compiler/tests/syntax/expressions/percent2.slint index 69e5d0f0de5..6f166fafc73 100644 --- a/internal/compiler/tests/syntax/expressions/percent2.slint +++ b/internal/compiler/tests/syntax/expressions/percent2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component Foo { diff --git a/internal/compiler/tests/syntax/expressions/strings.slint b/internal/compiler/tests/syntax/expressions/strings.slint index e06add63c3c..fc80007d0f5 100644 --- a/internal/compiler/tests/syntax/expressions/strings.slint +++ b/internal/compiler/tests/syntax/expressions/strings.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Test := Window { Text { diff --git a/internal/compiler/tests/syntax/expressions/unary_op.slint b/internal/compiler/tests/syntax/expressions/unary_op.slint index dc64fc94b66..b304762c507 100644 --- a/internal/compiler/tests/syntax/expressions/unary_op.slint +++ b/internal/compiler/tests/syntax/expressions/unary_op.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Xxx := Rectangle { property err_str1: + "foobar"; diff --git a/internal/compiler/tests/syntax/focus/focus_invalid.slint b/internal/compiler/tests/syntax/focus/focus_invalid.slint index dcfa50f08f9..baa3f3c00da 100644 --- a/internal/compiler/tests/syntax/focus/focus_invalid.slint +++ b/internal/compiler/tests/syntax/focus/focus_invalid.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export X := Rectangle { forward-focus: nothingness; diff --git a/internal/compiler/tests/syntax/focus/focus_not_called.slint b/internal/compiler/tests/syntax/focus/focus_not_called.slint index 008cbb7e566..064ef22cf93 100644 --- a/internal/compiler/tests/syntax/focus/focus_not_called.slint +++ b/internal/compiler/tests/syntax/focus/focus_not_called.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component BadOne { diff --git a/internal/compiler/tests/syntax/focus/focus_wrong_args.slint b/internal/compiler/tests/syntax/focus/focus_wrong_args.slint index a45c095c70f..635971456a6 100644 --- a/internal/compiler/tests/syntax/focus/focus_wrong_args.slint +++ b/internal/compiler/tests/syntax/focus/focus_wrong_args.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 diff --git a/internal/compiler/tests/syntax/focus/initial_focus_non_input.slint b/internal/compiler/tests/syntax/focus/initial_focus_non_input.slint index 4a4dd017b4a..2e947ba5276 100644 --- a/internal/compiler/tests/syntax/focus/initial_focus_non_input.slint +++ b/internal/compiler/tests/syntax/focus/initial_focus_non_input.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export X := Rectangle { diff --git a/internal/compiler/tests/syntax/functions/function_double_qualified.slint b/internal/compiler/tests/syntax/functions/function_double_qualified.slint index 02a92617d19..5759099b084 100644 --- a/internal/compiler/tests/syntax/functions/function_double_qualified.slint +++ b/internal/compiler/tests/syntax/functions/function_double_qualified.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component Err { diff --git a/internal/compiler/tests/syntax/functions/functions.slint b/internal/compiler/tests/syntax/functions/functions.slint index 6075a6aed46..d6108fa5d93 100644 --- a/internal/compiler/tests/syntax/functions/functions.slint +++ b/internal/compiler/tests/syntax/functions/functions.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Abc := Rectangle { function par() {} diff --git a/internal/compiler/tests/syntax/functions/functions_call.slint b/internal/compiler/tests/syntax/functions/functions_call.slint index 4a42daa3e34..9c9b03c649d 100644 --- a/internal/compiler/tests/syntax/functions/functions_call.slint +++ b/internal/compiler/tests/syntax/functions/functions_call.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 global Glob { function g1() {} diff --git a/internal/compiler/tests/syntax/functions/functions_purity.slint b/internal/compiler/tests/syntax/functions/functions_purity.slint index 4c73b644649..b7f728db014 100644 --- a/internal/compiler/tests/syntax/functions/functions_purity.slint +++ b/internal/compiler/tests/syntax/functions/functions_purity.slint @@ -1,7 +1,11 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component Foo { property prop; diff --git a/internal/compiler/tests/syntax/imports/bug_2719.slint b/internal/compiler/tests/syntax/imports/bug_2719.slint index 8408599956b..2326504aa29 100644 --- a/internal/compiler/tests/syntax/imports/bug_2719.slint +++ b/internal/compiler/tests/syntax/imports/bug_2719.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Qq } from "../../typeloader/incpath/bug_2719_import.slint"; diff --git a/internal/compiler/tests/syntax/imports/bug_3674_alias-from-broken-import.slint b/internal/compiler/tests/syntax/imports/bug_3674_alias-from-broken-import.slint index 3e94ec50f28..40199a1a447 100644 --- a/internal/compiler/tests/syntax/imports/bug_3674_alias-from-broken-import.slint +++ b/internal/compiler/tests/syntax/imports/bug_3674_alias-from-broken-import.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Bug } from "../../typeloader/incpath/bug_3674_alias_from_invalid_import.slint"; diff --git a/internal/compiler/tests/syntax/imports/cyclic_import.slint b/internal/compiler/tests/syntax/imports/cyclic_import.slint index e1a68053472..105cf50f284 100644 --- a/internal/compiler/tests/syntax/imports/cyclic_import.slint +++ b/internal/compiler/tests/syntax/imports/cyclic_import.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Rec12 } from "../../typeloader/recursive_import1.slint"; // ^error{No exported type called 'Rec12' found in ".*recursive_import1.slint"} diff --git a/internal/compiler/tests/syntax/imports/error_in_import.slint b/internal/compiler/tests/syntax/imports/error_in_import.slint index 33e18922243..a0748bbb61c 100644 --- a/internal/compiler/tests/syntax/imports/error_in_import.slint +++ b/internal/compiler/tests/syntax/imports/error_in_import.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { X } from "../../typeloader/incpath/should_fail2.slint"; diff --git a/internal/compiler/tests/syntax/imports/error_in_import2.slint b/internal/compiler/tests/syntax/imports/error_in_import2.slint index 67f2bb4c5d5..82d601c9ce7 100644 --- a/internal/compiler/tests/syntax/imports/error_in_import2.slint +++ b/internal/compiler/tests/syntax/imports/error_in_import2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Y } from "../../typeloader/incpath/should_fail3.slint"; diff --git a/internal/compiler/tests/syntax/imports/error_in_import3.slint b/internal/compiler/tests/syntax/imports/error_in_import3.slint index 480631d6d52..259877eb756 100644 --- a/internal/compiler/tests/syntax/imports/error_in_import3.slint +++ b/internal/compiler/tests/syntax/imports/error_in_import3.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Z } from "../../typeloader/incpath/should_fail4.slint"; diff --git a/internal/compiler/tests/syntax/imports/font.slint b/internal/compiler/tests/syntax/imports/font.slint index a406c0f3677..7c7f3ba202a 100644 --- a/internal/compiler/tests/syntax/imports/font.slint +++ b/internal/compiler/tests/syntax/imports/font.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import "myfont.ttf"; // ^error{File "myfont.ttf" not found} diff --git a/internal/compiler/tests/syntax/imports/import_builtin.slint b/internal/compiler/tests/syntax/imports/import_builtin.slint index d0d340cd00a..0a03a685039 100644 --- a/internal/compiler/tests/syntax/imports/import_builtin.slint +++ b/internal/compiler/tests/syntax/imports/import_builtin.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Even if that file exist in the style, it shouldn't be loaded import { StyleMetrics } from "std-widgets-impl.slint"; diff --git a/internal/compiler/tests/syntax/imports/import_error2.slint b/internal/compiler/tests/syntax/imports/import_error2.slint index bf7169f188f..bcf5cecb0db 100644 --- a/internal/compiler/tests/syntax/imports/import_error2.slint +++ b/internal/compiler/tests/syntax/imports/import_error2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { SomeRect } from "../../typeloader/incpath/local_helper_type.slint"; import "../../typeloader/incpath/local_helper_type.slint"; diff --git a/internal/compiler/tests/syntax/imports/import_errors.slint b/internal/compiler/tests/syntax/imports/import_errors.slint index 7216cd47c46..2cc2c797680 100644 --- a/internal/compiler/tests/syntax/imports/import_errors.slint +++ b/internal/compiler/tests/syntax/imports/import_errors.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { NotThere } from "file_not_there.slint"; // ^error{Cannot find requested import "file_not_there.slint" in the include search path} diff --git a/internal/compiler/tests/syntax/imports/import_parse_error1.slint b/internal/compiler/tests/syntax/imports/import_parse_error1.slint index 28b7e66ab5c..b9cb6cff538 100644 --- a/internal/compiler/tests/syntax/imports/import_parse_error1.slint +++ b/internal/compiler/tests/syntax/imports/import_parse_error1.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import; // ^error{Syntax error: expected '\{'} diff --git a/internal/compiler/tests/syntax/imports/import_parse_error2.slint b/internal/compiler/tests/syntax/imports/import_parse_error2.slint index cfb00364513..149964bace1 100644 --- a/internal/compiler/tests/syntax/imports/import_parse_error2.slint +++ b/internal/compiler/tests/syntax/imports/import_parse_error2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import foo from bar; // ^error{Syntax error: expected '\{'} diff --git a/internal/compiler/tests/syntax/imports/import_parse_error3.slint b/internal/compiler/tests/syntax/imports/import_parse_error3.slint index 5f2edeb5cd6..170e7e38085 100644 --- a/internal/compiler/tests/syntax/imports/import_parse_error3.slint +++ b/internal/compiler/tests/syntax/imports/import_parse_error3.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { A } yo; // ^error{Expected from keyword for import statement} diff --git a/internal/compiler/tests/syntax/imports/import_parse_error4.slint b/internal/compiler/tests/syntax/imports/import_parse_error4.slint index bf21f6f9feb..cba744ae0af 100644 --- a/internal/compiler/tests/syntax/imports/import_parse_error4.slint +++ b/internal/compiler/tests/syntax/imports/import_parse_error4.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Foo } from yo; // ^error{Expected plain string literal} diff --git a/internal/compiler/tests/syntax/imports/import_parse_error5.slint b/internal/compiler/tests/syntax/imports/import_parse_error5.slint index 5459f62847e..0791ebc12e6 100644 --- a/internal/compiler/tests/syntax/imports/import_parse_error5.slint +++ b/internal/compiler/tests/syntax/imports/import_parse_error5.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { NotExported } from "../../typeloader/incpath/local_helper_type.slint"; // ^error{No exported type called 'NotExported' found} diff --git a/internal/compiler/tests/syntax/imports/invalid_export.slint b/internal/compiler/tests/syntax/imports/invalid_export.slint index 7e5104236d7..753b9d92765 100644 --- a/internal/compiler/tests/syntax/imports/invalid_export.slint +++ b/internal/compiler/tests/syntax/imports/invalid_export.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export { Foo as Bar } // ^error{'Foo' not found} diff --git a/internal/compiler/tests/syntax/imports/visibility_errors.slint b/internal/compiler/tests/syntax/imports/visibility_errors.slint index afd9f040a27..31377b6f11e 100644 --- a/internal/compiler/tests/syntax/imports/visibility_errors.slint +++ b/internal/compiler/tests/syntax/imports/visibility_errors.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { SomeRect } from "../../typeloader/incpath/local_helper_type.slint"; diff --git a/internal/compiler/tests/syntax/layout/if_in_grid.slint b/internal/compiler/tests/syntax/layout/if_in_grid.slint index 70ea54f8261..79fbf2240f5 100644 --- a/internal/compiler/tests/syntax/layout/if_in_grid.slint +++ b/internal/compiler/tests/syntax/layout/if_in_grid.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Test := Rectangle { property condition; diff --git a/internal/compiler/tests/syntax/layout/if_in_grid_row.slint b/internal/compiler/tests/syntax/layout/if_in_grid_row.slint index 05c0cf66fbf..bb6ca62fdd5 100644 --- a/internal/compiler/tests/syntax/layout/if_in_grid_row.slint +++ b/internal/compiler/tests/syntax/layout/if_in_grid_row.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component Test { property condition; diff --git a/internal/compiler/tests/syntax/layout/min_max_conflict.slint b/internal/compiler/tests/syntax/layout/min_max_conflict.slint index a7b32edb8e5..7bc4524801d 100644 --- a/internal/compiler/tests/syntax/layout/min_max_conflict.slint +++ b/internal/compiler/tests/syntax/layout/min_max_conflict.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Test := Rectangle { diff --git a/internal/compiler/tests/syntax/layout/spacing.slint b/internal/compiler/tests/syntax/layout/spacing.slint index f10ca4e9a50..e9366c3d68f 100644 --- a/internal/compiler/tests/syntax/layout/spacing.slint +++ b/internal/compiler/tests/syntax/layout/spacing.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Test := Rectangle { diff --git a/internal/compiler/tests/syntax/lookup/absolute-position.slint b/internal/compiler/tests/syntax/lookup/absolute-position.slint index 7535badbbca..3740b13d0e7 100644 --- a/internal/compiler/tests/syntax/lookup/absolute-position.slint +++ b/internal/compiler/tests/syntax/lookup/absolute-position.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component Hello { Rectangle { diff --git a/internal/compiler/tests/syntax/lookup/array_index.slint b/internal/compiler/tests/syntax/lookup/array_index.slint index f40d49c7a38..309a2ef2a86 100644 --- a/internal/compiler/tests/syntax/lookup/array_index.slint +++ b/internal/compiler/tests/syntax/lookup/array_index.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Hello := Rectangle { diff --git a/internal/compiler/tests/syntax/lookup/callback_alias.slint b/internal/compiler/tests/syntax/lookup/callback_alias.slint index a320b328819..4f2e5024e0b 100644 --- a/internal/compiler/tests/syntax/lookup/callback_alias.slint +++ b/internal/compiler/tests/syntax/lookup/callback_alias.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Xxx := Rectangle { diff --git a/internal/compiler/tests/syntax/lookup/callback_alias2.slint b/internal/compiler/tests/syntax/lookup/callback_alias2.slint index 93043a73e98..a1f319d001c 100644 --- a/internal/compiler/tests/syntax/lookup/callback_alias2.slint +++ b/internal/compiler/tests/syntax/lookup/callback_alias2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Xxx := Rectangle { diff --git a/internal/compiler/tests/syntax/lookup/callback_alias3.slint b/internal/compiler/tests/syntax/lookup/callback_alias3.slint index a09de9503bc..d62e84d8981 100644 --- a/internal/compiler/tests/syntax/lookup/callback_alias3.slint +++ b/internal/compiler/tests/syntax/lookup/callback_alias3.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Sub := Rectangle { callback compute(int) -> int; diff --git a/internal/compiler/tests/syntax/lookup/callback_alias_issue4938.slint b/internal/compiler/tests/syntax/lookup/callback_alias_issue4938.slint index 214dc4df03c..d79b508699e 100644 --- a/internal/compiler/tests/syntax/lookup/callback_alias_issue4938.slint +++ b/internal/compiler/tests/syntax/lookup/callback_alias_issue4938.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component Xxx { callback issue4938 <=> issue4938; diff --git a/internal/compiler/tests/syntax/lookup/callback_not_called.slint b/internal/compiler/tests/syntax/lookup/callback_not_called.slint index 9cf48b3317a..620e31d84fd 100644 --- a/internal/compiler/tests/syntax/lookup/callback_not_called.slint +++ b/internal/compiler/tests/syntax/lookup/callback_not_called.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Demo := Window { callback foobar; diff --git a/internal/compiler/tests/syntax/lookup/callback_return.slint b/internal/compiler/tests/syntax/lookup/callback_return.slint index 3b68e01835e..9f824edff48 100644 --- a/internal/compiler/tests/syntax/lookup/callback_return.slint +++ b/internal/compiler/tests/syntax/lookup/callback_return.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Xxx := Rectangle { callback plop() -> string; diff --git a/internal/compiler/tests/syntax/lookup/color.slint b/internal/compiler/tests/syntax/lookup/color.slint index 7ecc96f33ed..ac8798fdec8 100644 --- a/internal/compiler/tests/syntax/lookup/color.slint +++ b/internal/compiler/tests/syntax/lookup/color.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export X := Rectangle { diff --git a/internal/compiler/tests/syntax/lookup/conversion.slint b/internal/compiler/tests/syntax/lookup/conversion.slint index ca674f86edc..b04e051991c 100644 --- a/internal/compiler/tests/syntax/lookup/conversion.slint +++ b/internal/compiler/tests/syntax/lookup/conversion.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 global Glob := { property len: 45px * 5; diff --git a/internal/compiler/tests/syntax/lookup/dashes.slint b/internal/compiler/tests/syntax/lookup/dashes.slint index 093f8f62c2d..d8e1af87975 100644 --- a/internal/compiler/tests/syntax/lookup/dashes.slint +++ b/internal/compiler/tests/syntax/lookup/dashes.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Xxx := Rectangle { diff --git a/internal/compiler/tests/syntax/lookup/deprecated_property.slint b/internal/compiler/tests/syntax/lookup/deprecated_property.slint index 123a22687f9..ba55ab97e70 100644 --- a/internal/compiler/tests/syntax/lookup/deprecated_property.slint +++ b/internal/compiler/tests/syntax/lookup/deprecated_property.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Xxx := Rectangle { color: white; diff --git a/internal/compiler/tests/syntax/lookup/enum.slint b/internal/compiler/tests/syntax/lookup/enum.slint index 047837b6547..448d7e2f06d 100644 --- a/internal/compiler/tests/syntax/lookup/enum.slint +++ b/internal/compiler/tests/syntax/lookup/enum.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Text { // allow unqualified enum when we can infer the type from the property assigned to diff --git a/internal/compiler/tests/syntax/lookup/for_lookup.slint b/internal/compiler/tests/syntax/lookup/for_lookup.slint index 7baddf69c11..ac2d32db7c8 100644 --- a/internal/compiler/tests/syntax/lookup/for_lookup.slint +++ b/internal/compiler/tests/syntax/lookup/for_lookup.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Hello := Rectangle { diff --git a/internal/compiler/tests/syntax/lookup/global.slint b/internal/compiler/tests/syntax/lookup/global.slint index 501046e2594..b158301fd60 100644 --- a/internal/compiler/tests/syntax/lookup/global.slint +++ b/internal/compiler/tests/syntax/lookup/global.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 global MyGlobal := { property custom_prop; diff --git a/internal/compiler/tests/syntax/lookup/if.slint b/internal/compiler/tests/syntax/lookup/if.slint index c8b8795d443..3f5e835ab8d 100644 --- a/internal/compiler/tests/syntax/lookup/if.slint +++ b/internal/compiler/tests/syntax/lookup/if.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Hello := Rectangle { diff --git a/internal/compiler/tests/syntax/lookup/issue_1461.slint b/internal/compiler/tests/syntax/lookup/issue_1461.slint index 75049a9a779..e72dc7fa595 100644 --- a/internal/compiler/tests/syntax/lookup/issue_1461.slint +++ b/internal/compiler/tests/syntax/lookup/issue_1461.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component Button inherits Rectangle { diff --git a/internal/compiler/tests/syntax/lookup/property.slint b/internal/compiler/tests/syntax/lookup/property.slint index 7b9c7175e2c..5ff85ae5e33 100644 --- a/internal/compiler/tests/syntax/lookup/property.slint +++ b/internal/compiler/tests/syntax/lookup/property.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Comp := Rectangle { property custom_prop; diff --git a/internal/compiler/tests/syntax/lookup/recover_id_lookup.slint b/internal/compiler/tests/syntax/lookup/recover_id_lookup.slint index 280b2990fa2..9ce73fbef75 100644 --- a/internal/compiler/tests/syntax/lookup/recover_id_lookup.slint +++ b/internal/compiler/tests/syntax/lookup/recover_id_lookup.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component Test { property abc; diff --git a/internal/compiler/tests/syntax/lookup/signal_arg.slint b/internal/compiler/tests/syntax/lookup/signal_arg.slint index 1a092e75fdc..34f398b214c 100644 --- a/internal/compiler/tests/syntax/lookup/signal_arg.slint +++ b/internal/compiler/tests/syntax/lookup/signal_arg.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Xxx := Rectangle { callback plop(string, color, int); diff --git a/internal/compiler/tests/syntax/lookup/two_way_binding.slint b/internal/compiler/tests/syntax/lookup/two_way_binding.slint index 931dec9ca3d..24ed94b6a85 100644 --- a/internal/compiler/tests/syntax/lookup/two_way_binding.slint +++ b/internal/compiler/tests/syntax/lookup/two_way_binding.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 global G := { property alala <=> alala; diff --git a/internal/compiler/tests/syntax/lookup/two_way_binding_infer.slint b/internal/compiler/tests/syntax/lookup/two_way_binding_infer.slint index 7ce481c75cf..d8d77fa1a12 100644 --- a/internal/compiler/tests/syntax/lookup/two_way_binding_infer.slint +++ b/internal/compiler/tests/syntax/lookup/two_way_binding_infer.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export X := Rectangle { diff --git a/internal/compiler/tests/syntax/lookup/two_way_binding_model.slint b/internal/compiler/tests/syntax/lookup/two_way_binding_model.slint index 2369c951ef0..c9858d6bc58 100644 --- a/internal/compiler/tests/syntax/lookup/two_way_binding_model.slint +++ b/internal/compiler/tests/syntax/lookup/two_way_binding_model.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 struct Foo { field: string diff --git a/internal/compiler/tests/syntax/new_syntax/deprecated_syntax.slint b/internal/compiler/tests/syntax/new_syntax/deprecated_syntax.slint index f361bb0a359..173b626563a 100644 --- a/internal/compiler/tests/syntax/new_syntax/deprecated_syntax.slint +++ b/internal/compiler/tests/syntax/new_syntax/deprecated_syntax.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 struct XX := {} diff --git a/internal/compiler/tests/syntax/new_syntax/input_output.slint b/internal/compiler/tests/syntax/new_syntax/input_output.slint index a388b515abc..c2a3fdc0a06 100644 --- a/internal/compiler/tests/syntax/new_syntax/input_output.slint +++ b/internal/compiler/tests/syntax/new_syntax/input_output.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component Compo inherits Rectangle { property priv1: 42; diff --git a/internal/compiler/tests/syntax/new_syntax/input_output2.slint b/internal/compiler/tests/syntax/new_syntax/input_output2.slint index 18efab8a750..5fb9dae6c0f 100644 --- a/internal/compiler/tests/syntax/new_syntax/input_output2.slint +++ b/internal/compiler/tests/syntax/new_syntax/input_output2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 global Glo { property priv1: 34; diff --git a/internal/compiler/tests/syntax/new_syntax/new_component.slint b/internal/compiler/tests/syntax/new_syntax/new_component.slint index f59eb4c319d..8ed8d18dad2 100644 --- a/internal/compiler/tests/syntax/new_syntax/new_component.slint +++ b/internal/compiler/tests/syntax/new_syntax/new_component.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component Foo { diff --git a/internal/compiler/tests/syntax/new_syntax/new_lookup.slint b/internal/compiler/tests/syntax/new_syntax/new_lookup.slint index 95fb62e52c1..1cfc5ba1d11 100644 --- a/internal/compiler/tests/syntax/new_syntax/new_lookup.slint +++ b/internal/compiler/tests/syntax/new_syntax/new_lookup.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component Compo inherits Text { diff --git a/internal/compiler/tests/syntax/new_syntax/two_way_input_output.slint b/internal/compiler/tests/syntax/new_syntax/two_way_input_output.slint index d88d781fd5f..f399366420d 100644 --- a/internal/compiler/tests/syntax/new_syntax/two_way_input_output.slint +++ b/internal/compiler/tests/syntax/new_syntax/two_way_input_output.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component Button { in property enabled : true; diff --git a/internal/compiler/tests/syntax/parse_error/children_placeholder0.slint b/internal/compiler/tests/syntax/parse_error/children_placeholder0.slint index edd322f8c68..cb730e2ef98 100644 --- a/internal/compiler/tests/syntax/parse_error/children_placeholder0.slint +++ b/internal/compiler/tests/syntax/parse_error/children_placeholder0.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Final := Window { VerticalLayout { diff --git a/internal/compiler/tests/syntax/parse_error/export0.slint b/internal/compiler/tests/syntax/parse_error/export0.slint index b0642c86a25..0afd4066ed6 100644 --- a/internal/compiler/tests/syntax/parse_error/export0.slint +++ b/internal/compiler/tests/syntax/parse_error/export0.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export - // ^error{Parse error: expected a top-level item such as a component, a struct, or a global} diff --git a/internal/compiler/tests/syntax/parse_error/export1.slint b/internal/compiler/tests/syntax/parse_error/export1.slint index fd986d57927..7728abde8a9 100644 --- a/internal/compiler/tests/syntax/parse_error/export1.slint +++ b/internal/compiler/tests/syntax/parse_error/export1.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export { Foo as } // ^error{expected Identifier} diff --git a/internal/compiler/tests/syntax/parse_error/if0.slint b/internal/compiler/tests/syntax/parse_error/if0.slint index 4737e80cecc..0e4e10a88fd 100644 --- a/internal/compiler/tests/syntax/parse_error/if0.slint +++ b/internal/compiler/tests/syntax/parse_error/if0.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Window { if // diff --git a/internal/compiler/tests/syntax/parse_error/if1.slint b/internal/compiler/tests/syntax/parse_error/if1.slint index 9f2bb3ce323..939fa5875b6 100644 --- a/internal/compiler/tests/syntax/parse_error/if1.slint +++ b/internal/compiler/tests/syntax/parse_error/if1.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Window { if ( diff --git a/internal/compiler/tests/syntax/parse_error/if2.slint b/internal/compiler/tests/syntax/parse_error/if2.slint index ad2fe922865..9fa0eecaffc 100644 --- a/internal/compiler/tests/syntax/parse_error/if2.slint +++ b/internal/compiler/tests/syntax/parse_error/if2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Window { if () : diff --git a/internal/compiler/tests/syntax/parse_error/if3.slint b/internal/compiler/tests/syntax/parse_error/if3.slint index 8efe11c47ce..9db521d4aeb 100644 --- a/internal/compiler/tests/syntax/parse_error/if3.slint +++ b/internal/compiler/tests/syntax/parse_error/if3.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Window { if goo diff --git a/internal/compiler/tests/syntax/parse_error/if4.slint b/internal/compiler/tests/syntax/parse_error/if4.slint index fa8fbbda169..2507bab8467 100644 --- a/internal/compiler/tests/syntax/parse_error/if4.slint +++ b/internal/compiler/tests/syntax/parse_error/if4.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Window { if (true false) : Rectangle { } diff --git a/internal/compiler/tests/syntax/parse_error/property1.slint b/internal/compiler/tests/syntax/parse_error/property1.slint index 36dfa22031d..ca020ed7648 100644 --- a/internal/compiler/tests/syntax/parse_error/property1.slint +++ b/internal/compiler/tests/syntax/parse_error/property1.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Window { ta := TouchArea { } diff --git a/internal/compiler/tests/syntax/parse_error/property2.slint b/internal/compiler/tests/syntax/parse_error/property2.slint index 15761fd29fd..6ccfad4b931 100644 --- a/internal/compiler/tests/syntax/parse_error/property2.slint +++ b/internal/compiler/tests/syntax/parse_error/property2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Window { ta := TouchArea { } diff --git a/internal/compiler/tests/syntax/parse_error/state1.slint b/internal/compiler/tests/syntax/parse_error/state1.slint index 00511a858d8..d099add3a9a 100644 --- a/internal/compiler/tests/syntax/parse_error/state1.slint +++ b/internal/compiler/tests/syntax/parse_error/state1.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Rectangle { property checked; diff --git a/internal/compiler/tests/syntax/parse_error/state2.slint b/internal/compiler/tests/syntax/parse_error/state2.slint index f62fa032128..bc203b69acc 100644 --- a/internal/compiler/tests/syntax/parse_error/state2.slint +++ b/internal/compiler/tests/syntax/parse_error/state2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Rectangle { states [ diff --git a/internal/compiler/tests/syntax/parse_error/state3.slint b/internal/compiler/tests/syntax/parse_error/state3.slint index 0dcd8e3a1d5..593a0dda987 100644 --- a/internal/compiler/tests/syntax/parse_error/state3.slint +++ b/internal/compiler/tests/syntax/parse_error/state3.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Rectangle { states [ diff --git a/internal/compiler/tests/syntax/parse_error/struct.slint b/internal/compiler/tests/syntax/parse_error/struct.slint index 9f5aac6dca8..1d33865deb5 100644 --- a/internal/compiler/tests/syntax/parse_error/struct.slint +++ b/internal/compiler/tests/syntax/parse_error/struct.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export struct TetronimoBrettData { fliesen: [FlieseData]; diff --git a/internal/compiler/tests/syntax_tests.rs b/internal/compiler/tests/syntax_tests.rs index 5df252f038e..5357744a5c7 100644 --- a/internal/compiler/tests/syntax_tests.rs +++ b/internal/compiler/tests/syntax_tests.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This test is trying to compile all the *.slint files in the sub directories and check that compilation //! errors are properly reported diff --git a/internal/compiler/tests/typeloader/custom_style/TestStyle/std-widgets.slint b/internal/compiler/tests/typeloader/custom_style/TestStyle/std-widgets.slint index 14582f41475..38ad4cd44d7 100644 --- a/internal/compiler/tests/typeloader/custom_style/TestStyle/std-widgets.slint +++ b/internal/compiler/tests/typeloader/custom_style/TestStyle/std-widgets.slint @@ -1,2 +1,6 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 diff --git a/internal/compiler/tests/typeloader/dependency_local.slint b/internal/compiler/tests/typeloader/dependency_local.slint index bfb3b5d3f45..cef5e5d9d0d 100644 --- a/internal/compiler/tests/typeloader/dependency_local.slint +++ b/internal/compiler/tests/typeloader/dependency_local.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { AnotherType } from "./incpath/dependency_from_incpath.slint"; diff --git a/internal/compiler/tests/typeloader/dependency_test_main.slint b/internal/compiler/tests/typeloader/dependency_test_main.slint index f69837130a7..cb1fbf40f5a 100644 --- a/internal/compiler/tests/typeloader/dependency_test_main.slint +++ b/internal/compiler/tests/typeloader/dependency_test_main.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { SubType } from "./dependency_local.slint"; import { AnotherType } from "dependency_from_incpath.slint"; diff --git a/internal/compiler/tests/typeloader/incpath/bug_2719_import.slint b/internal/compiler/tests/typeloader/incpath/bug_2719_import.slint index d0ec224c402..fc405d60fc8 100644 --- a/internal/compiler/tests/typeloader/incpath/bug_2719_import.slint +++ b/internal/compiler/tests/typeloader/incpath/bug_2719_import.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { SomeRect } from "tests/typeloader/incpath/local_helper_type.slint"; diff --git a/internal/compiler/tests/typeloader/incpath/bug_3674_alias_from_invalid_import.slint b/internal/compiler/tests/typeloader/incpath/bug_3674_alias_from_invalid_import.slint index 334d9e8233c..94b04650a91 100644 --- a/internal/compiler/tests/typeloader/incpath/bug_3674_alias_from_invalid_import.slint +++ b/internal/compiler/tests/typeloader/incpath/bug_3674_alias_from_invalid_import.slint @@ -1,6 +1,10 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { NotExist } from "idontexist.slint"; // ^error{Cannot find requested import "idontexist.slint" in the include search path} diff --git a/internal/compiler/tests/typeloader/incpath/dependency_from_incpath.slint b/internal/compiler/tests/typeloader/incpath/dependency_from_incpath.slint index 369939f0247..d495471eec5 100644 --- a/internal/compiler/tests/typeloader/incpath/dependency_from_incpath.slint +++ b/internal/compiler/tests/typeloader/incpath/dependency_from_incpath.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { SomeRect } from "./local_helper_type.slint"; diff --git a/internal/compiler/tests/typeloader/incpath/local_helper_type.slint b/internal/compiler/tests/typeloader/incpath/local_helper_type.slint index 1861bf164d9..d2151e7bd6b 100644 --- a/internal/compiler/tests/typeloader/incpath/local_helper_type.slint +++ b/internal/compiler/tests/typeloader/incpath/local_helper_type.slint @@ -1,4 +1,8 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component SomeRect inherits Rectangle {} diff --git a/internal/compiler/tests/typeloader/incpath/should_fail.slint b/internal/compiler/tests/typeloader/incpath/should_fail.slint index 85cca7fe697..bcadcbf0a1e 100644 --- a/internal/compiler/tests/typeloader/incpath/should_fail.slint +++ b/internal/compiler/tests/typeloader/incpath/should_fail.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export X := SomeRect { // ^error{Unknown type SomeRect} diff --git a/internal/compiler/tests/typeloader/incpath/should_fail2.slint b/internal/compiler/tests/typeloader/incpath/should_fail2.slint index 5ff2abbe676..4a02c85aa0b 100644 --- a/internal/compiler/tests/typeloader/incpath/should_fail2.slint +++ b/internal/compiler/tests/typeloader/incpath/should_fail2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export X := Rectangle { eh := Invalid { diff --git a/internal/compiler/tests/typeloader/incpath/should_fail3.slint b/internal/compiler/tests/typeloader/incpath/should_fail3.slint index a1983a13625..01beee6f3c2 100644 --- a/internal/compiler/tests/typeloader/incpath/should_fail3.slint +++ b/internal/compiler/tests/typeloader/incpath/should_fail3.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Y := Rectangle { property hello: max; diff --git a/internal/compiler/tests/typeloader/incpath/should_fail4.slint b/internal/compiler/tests/typeloader/incpath/should_fail4.slint index a4d46851921..afa3bb7a45f 100644 --- a/internal/compiler/tests/typeloader/incpath/should_fail4.slint +++ b/internal/compiler/tests/typeloader/incpath/should_fail4.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Unused := Rectangle { // FIXME: looks like binding loop is not diagnosed in exports if the properties are not used diff --git a/internal/compiler/tests/typeloader/library/dependency_from_library.slint b/internal/compiler/tests/typeloader/library/dependency_from_library.slint index 04c5f2f4048..a7cbc5baa20 100644 --- a/internal/compiler/tests/typeloader/library/dependency_from_library.slint +++ b/internal/compiler/tests/typeloader/library/dependency_from_library.slint @@ -1,4 +1,8 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component LibraryType inherits Rectangle {} diff --git a/internal/compiler/tests/typeloader/library/lib.slint b/internal/compiler/tests/typeloader/library/lib.slint index 7beba40c30f..a3bde67b4d4 100644 --- a/internal/compiler/tests/typeloader/library/lib.slint +++ b/internal/compiler/tests/typeloader/library/lib.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { LibraryType } from "./dependency_from_library.slint"; export { LibraryType } diff --git a/internal/compiler/tests/typeloader/library/library_helper_type.slint b/internal/compiler/tests/typeloader/library/library_helper_type.slint index 2e49fc8ae42..618f7f7d285 100644 --- a/internal/compiler/tests/typeloader/library/library_helper_type.slint +++ b/internal/compiler/tests/typeloader/library/library_helper_type.slint @@ -1,4 +1,8 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component LibraryHelperType inherits Rectangle {} diff --git a/internal/compiler/tests/typeloader/recursive_import1.slint b/internal/compiler/tests/typeloader/recursive_import1.slint index 4f9dc213868..7d79fd60951 100644 --- a/internal/compiler/tests/typeloader/recursive_import1.slint +++ b/internal/compiler/tests/typeloader/recursive_import1.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Rec2 } from "./recursive_import2.slint"; diff --git a/internal/compiler/tests/typeloader/recursive_import2.slint b/internal/compiler/tests/typeloader/recursive_import2.slint index c74651445e6..0ab2dd94a98 100644 --- a/internal/compiler/tests/typeloader/recursive_import2.slint +++ b/internal/compiler/tests/typeloader/recursive_import2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Rec1 } from "./recursive_import1.slint"; // ^error{Recursive import of .*recursive_import1.slint} diff --git a/internal/compiler/tests/typeloader/some_rust_file.rs b/internal/compiler/tests/typeloader/some_rust_file.rs index 03c1589cead..27ca33fbb62 100644 --- a/internal/compiler/tests/typeloader/some_rust_file.rs +++ b/internal/compiler/tests/typeloader/some_rust_file.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 slint!( import { SubType } from "./tests/typeloader/dependency_local.slint"; diff --git a/internal/compiler/typeloader.rs b/internal/compiler/typeloader.rs index 4ab13cec94b..7b28d826030 100644 --- a/internal/compiler/typeloader.rs +++ b/internal/compiler/typeloader.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::cell::RefCell; use std::collections::{HashMap, HashSet}; diff --git a/internal/compiler/typeregister.rs b/internal/compiler/typeregister.rs index 316c203ae5f..8ed268d3a8f 100644 --- a/internal/compiler/typeregister.rs +++ b/internal/compiler/typeregister.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore imum diff --git a/internal/compiler/widgets/common/combobox-base.slint b/internal/compiler/widgets/common/combobox-base.slint index 66f4e750e07..cba5c19f1f8 100644 --- a/internal/compiler/widgets/common/combobox-base.slint +++ b/internal/compiler/widgets/common/combobox-base.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component ComboBoxBase { in property <[string]> model; diff --git a/internal/compiler/widgets/common/common.slint b/internal/compiler/widgets/common/common.slint index 898e13638be..34dd4bd1401 100644 --- a/internal/compiler/widgets/common/common.slint +++ b/internal/compiler/widgets/common/common.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics, Palette, ScrollView, Palette } from "std-widgets-impl.slint"; diff --git a/internal/compiler/widgets/common/lineedit-base.slint b/internal/compiler/widgets/common/lineedit-base.slint index 250f5e00905..2de85d759a0 100644 --- a/internal/compiler/widgets/common/lineedit-base.slint +++ b/internal/compiler/widgets/common/lineedit-base.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component LineEditBase inherits Rectangle { in-out property placeholder-text; diff --git a/internal/compiler/widgets/common/listview.slint b/internal/compiler/widgets/common/listview.slint index 2690560f125..c828d621edb 100644 --- a/internal/compiler/widgets/common/listview.slint +++ b/internal/compiler/widgets/common/listview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ListItem, ScrollView } from "std-widgets-impl.slint"; diff --git a/internal/compiler/widgets/common/slider-base.slint b/internal/compiler/widgets/common/slider-base.slint index a2c6a04cb7e..55db6866a61 100644 --- a/internal/compiler/widgets/common/slider-base.slint +++ b/internal/compiler/widgets/common/slider-base.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component SliderBase { in property enabled <=> touch-area.enabled; diff --git a/internal/compiler/widgets/common/spinbox-base.slint b/internal/compiler/widgets/common/spinbox-base.slint index 31488878b23..1399414d8b7 100644 --- a/internal/compiler/widgets/common/spinbox-base.slint +++ b/internal/compiler/widgets/common/spinbox-base.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component SpinBoxBase { in property minimum; diff --git a/internal/compiler/widgets/common/spinner-base.slint b/internal/compiler/widgets/common/spinner-base.slint index eda741da522..588e056facf 100644 --- a/internal/compiler/widgets/common/spinner-base.slint +++ b/internal/compiler/widgets/common/spinner-base.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component SpinnerBase { in property progress; diff --git a/internal/compiler/widgets/common/standardbutton.slint b/internal/compiler/widgets/common/standardbutton.slint index 7ca00afd5e7..d74006901ef 100644 --- a/internal/compiler/widgets/common/standardbutton.slint +++ b/internal/compiler/widgets/common/standardbutton.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics, Button } from "std-widgets-impl.slint"; diff --git a/internal/compiler/widgets/common/tabwidget-base.slint b/internal/compiler/widgets/common/tabwidget-base.slint index 14f4b59f599..da838227fa0 100644 --- a/internal/compiler/widgets/common/tabwidget-base.slint +++ b/internal/compiler/widgets/common/tabwidget-base.slint @@ -1,5 +1,5 @@ // Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial export component TabBarBase inherits TouchArea { // injected properties: diff --git a/internal/compiler/widgets/cosmic-base/button.slint b/internal/compiler/widgets/cosmic-base/button.slint index 5935b10e7c3..d4261e91d29 100644 --- a/internal/compiler/widgets/cosmic-base/button.slint +++ b/internal/compiler/widgets/cosmic-base/button.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CosmicFontSettings, CosmicPalette } from "styling.slint"; import { StateLayer } from "components.slint"; diff --git a/internal/compiler/widgets/cosmic-base/checkbox.slint b/internal/compiler/widgets/cosmic-base/checkbox.slint index 75cb83c9a9b..5c9274f00d4 100644 --- a/internal/compiler/widgets/cosmic-base/checkbox.slint +++ b/internal/compiler/widgets/cosmic-base/checkbox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CosmicFontSettings, CosmicPalette, Icons } from "styling.slint"; import { StateLayer } from "components.slint"; diff --git a/internal/compiler/widgets/cosmic-base/combobox.slint b/internal/compiler/widgets/cosmic-base/combobox.slint index 5338df3f0f3..7b2e747d6d6 100644 --- a/internal/compiler/widgets/cosmic-base/combobox.slint +++ b/internal/compiler/widgets/cosmic-base/combobox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CosmicFontSettings, CosmicPalette, Icons } from "styling.slint"; import { MenuBorder, ListItem, StateLayerBase } from "components.slint"; diff --git a/internal/compiler/widgets/cosmic-base/components.slint b/internal/compiler/widgets/cosmic-base/components.slint index 2996139d3b7..f56c5e063a8 100644 --- a/internal/compiler/widgets/cosmic-base/components.slint +++ b/internal/compiler/widgets/cosmic-base/components.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Icons, CosmicPalette, CosmicFontSettings } from "styling.slint"; diff --git a/internal/compiler/widgets/cosmic-base/groupbox.slint b/internal/compiler/widgets/cosmic-base/groupbox.slint index f684d0cb912..2bdba15a69d 100644 --- a/internal/compiler/widgets/cosmic-base/groupbox.slint +++ b/internal/compiler/widgets/cosmic-base/groupbox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CosmicFontSettings, CosmicPalette } from "styling.slint"; diff --git a/internal/compiler/widgets/cosmic-base/layouts.slint b/internal/compiler/widgets/cosmic-base/layouts.slint index 6f6a37b8e31..2cdd8d531d7 100644 --- a/internal/compiler/widgets/cosmic-base/layouts.slint +++ b/internal/compiler/widgets/cosmic-base/layouts.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics } from "std-widgets-impl.slint"; diff --git a/internal/compiler/widgets/cosmic-base/lineedit.slint b/internal/compiler/widgets/cosmic-base/lineedit.slint index 60af89fb489..18339a421bc 100644 --- a/internal/compiler/widgets/cosmic-base/lineedit.slint +++ b/internal/compiler/widgets/cosmic-base/lineedit.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CosmicFontSettings, CosmicPalette } from "styling.slint"; import { LineEditBase} from "../common/lineedit-base.slint"; diff --git a/internal/compiler/widgets/cosmic-base/progressindicator.slint b/internal/compiler/widgets/cosmic-base/progressindicator.slint index b7bb8fc2bee..1c72d6ba25c 100644 --- a/internal/compiler/widgets/cosmic-base/progressindicator.slint +++ b/internal/compiler/widgets/cosmic-base/progressindicator.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CosmicPalette } from "styling.slint"; diff --git a/internal/compiler/widgets/cosmic-base/scrollview.slint b/internal/compiler/widgets/cosmic-base/scrollview.slint index bba29da610c..61bba87a2b4 100644 --- a/internal/compiler/widgets/cosmic-base/scrollview.slint +++ b/internal/compiler/widgets/cosmic-base/scrollview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CosmicPalette, Icons } from "styling.slint"; import { StateLayerBase } from "components.slint"; diff --git a/internal/compiler/widgets/cosmic-base/slider.slint b/internal/compiler/widgets/cosmic-base/slider.slint index 35cc9980b4c..60144b086a4 100644 --- a/internal/compiler/widgets/cosmic-base/slider.slint +++ b/internal/compiler/widgets/cosmic-base/slider.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CosmicPalette } from "styling.slint"; import { StateLayerBase } from "components.slint"; diff --git a/internal/compiler/widgets/cosmic-base/spinbox.slint b/internal/compiler/widgets/cosmic-base/spinbox.slint index 19b73b07553..3b0133b2914 100644 --- a/internal/compiler/widgets/cosmic-base/spinbox.slint +++ b/internal/compiler/widgets/cosmic-base/spinbox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CosmicPalette, CosmicFontSettings, Icons } from "styling.slint"; import { SpinBoxBase } from "../common/spinbox-base.slint"; diff --git a/internal/compiler/widgets/cosmic-base/spinner.slint b/internal/compiler/widgets/cosmic-base/spinner.slint index 302d1d1f8cf..f48ba3ca6cd 100644 --- a/internal/compiler/widgets/cosmic-base/spinner.slint +++ b/internal/compiler/widgets/cosmic-base/spinner.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CosmicPalette } from "styling.slint"; import { SpinnerBase } from "../common/spinner-base.slint"; diff --git a/internal/compiler/widgets/cosmic-base/std-widgets-base.slint b/internal/compiler/widgets/cosmic-base/std-widgets-base.slint index 558dc929950..35f80f09a1c 100644 --- a/internal/compiler/widgets/cosmic-base/std-widgets-base.slint +++ b/internal/compiler/widgets/cosmic-base/std-widgets-base.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore standardbutton diff --git a/internal/compiler/widgets/cosmic-base/std-widgets-impl.slint b/internal/compiler/widgets/cosmic-base/std-widgets-impl.slint index cacd6232788..305ab52d60c 100644 --- a/internal/compiler/widgets/cosmic-base/std-widgets-impl.slint +++ b/internal/compiler/widgets/cosmic-base/std-widgets-impl.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ColorSchemeSelector } from "color-scheme.slint"; diff --git a/internal/compiler/widgets/cosmic-base/styling.slint b/internal/compiler/widgets/cosmic-base/styling.slint index bc9768f6269..b684584d763 100644 --- a/internal/compiler/widgets/cosmic-base/styling.slint +++ b/internal/compiler/widgets/cosmic-base/styling.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ColorSchemeSelector } from "color-scheme.slint"; diff --git a/internal/compiler/widgets/cosmic-base/switch.slint b/internal/compiler/widgets/cosmic-base/switch.slint index 35e1f2f9272..1682dc6d4a7 100644 --- a/internal/compiler/widgets/cosmic-base/switch.slint +++ b/internal/compiler/widgets/cosmic-base/switch.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CosmicFontSettings, CosmicPalette } from "styling.slint"; import { StateLayer } from "components.slint"; diff --git a/internal/compiler/widgets/cosmic-base/tableview.slint b/internal/compiler/widgets/cosmic-base/tableview.slint index f79273a7f56..b5a09131a5f 100644 --- a/internal/compiler/widgets/cosmic-base/tableview.slint +++ b/internal/compiler/widgets/cosmic-base/tableview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CosmicPalette, CosmicFontSettings, Icons } from "styling.slint"; import { ListView } from "../common/listview.slint"; diff --git a/internal/compiler/widgets/cosmic-base/tabwidget.slint b/internal/compiler/widgets/cosmic-base/tabwidget.slint index 8ff663f67d4..38314980bcf 100644 --- a/internal/compiler/widgets/cosmic-base/tabwidget.slint +++ b/internal/compiler/widgets/cosmic-base/tabwidget.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CosmicPalette, CosmicFontSettings } from "styling.slint"; import { StateLayerBase } from "components.slint"; diff --git a/internal/compiler/widgets/cosmic-base/textedit.slint b/internal/compiler/widgets/cosmic-base/textedit.slint index 517c1f323be..5dfc321f08c 100644 --- a/internal/compiler/widgets/cosmic-base/textedit.slint +++ b/internal/compiler/widgets/cosmic-base/textedit.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CosmicFontSettings, CosmicPalette } from "styling.slint"; import { ScrollView } from "scrollview.slint"; diff --git a/internal/compiler/widgets/cosmic-dark/color-scheme.slint b/internal/compiler/widgets/cosmic-dark/color-scheme.slint index c3418941eb5..b57512f555e 100644 --- a/internal/compiler/widgets/cosmic-dark/color-scheme.slint +++ b/internal/compiler/widgets/cosmic-dark/color-scheme.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export global ColorSchemeSelector { in property color-scheme: ColorScheme.dark; diff --git a/internal/compiler/widgets/cosmic-dark/std-widgets-impl.slint b/internal/compiler/widgets/cosmic-dark/std-widgets-impl.slint index 4a356042c93..b65c24bc780 100644 --- a/internal/compiler/widgets/cosmic-dark/std-widgets-impl.slint +++ b/internal/compiler/widgets/cosmic-dark/std-widgets-impl.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics, ScrollView, Button, ListItem, Palette } from "../cosmic-base/std-widgets-impl.slint"; export { StyleMetrics, ScrollView, Button, ListItem, Palette } diff --git a/internal/compiler/widgets/cosmic-dark/std-widgets.slint b/internal/compiler/widgets/cosmic-dark/std-widgets.slint index e06265c52a6..790d4f736a2 100644 --- a/internal/compiler/widgets/cosmic-dark/std-widgets.slint +++ b/internal/compiler/widgets/cosmic-dark/std-widgets.slint @@ -1,4 +1,8 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export * from "../cosmic-base/std-widgets-base.slint"; diff --git a/internal/compiler/widgets/cosmic-light/color-scheme.slint b/internal/compiler/widgets/cosmic-light/color-scheme.slint index 87a4ea37089..36bd02c6cb1 100644 --- a/internal/compiler/widgets/cosmic-light/color-scheme.slint +++ b/internal/compiler/widgets/cosmic-light/color-scheme.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export global ColorSchemeSelector { in property color-scheme: ColorScheme.light; diff --git a/internal/compiler/widgets/cosmic-light/std-widgets-impl.slint b/internal/compiler/widgets/cosmic-light/std-widgets-impl.slint index 4a356042c93..b65c24bc780 100644 --- a/internal/compiler/widgets/cosmic-light/std-widgets-impl.slint +++ b/internal/compiler/widgets/cosmic-light/std-widgets-impl.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics, ScrollView, Button, ListItem, Palette } from "../cosmic-base/std-widgets-impl.slint"; export { StyleMetrics, ScrollView, Button, ListItem, Palette } diff --git a/internal/compiler/widgets/cosmic-light/std-widgets.slint b/internal/compiler/widgets/cosmic-light/std-widgets.slint index e06265c52a6..790d4f736a2 100644 --- a/internal/compiler/widgets/cosmic-light/std-widgets.slint +++ b/internal/compiler/widgets/cosmic-light/std-widgets.slint @@ -1,4 +1,8 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export * from "../cosmic-base/std-widgets-base.slint"; diff --git a/internal/compiler/widgets/cosmic/color-scheme.slint b/internal/compiler/widgets/cosmic/color-scheme.slint index 71a226e6ba1..e132f9e1c73 100644 --- a/internal/compiler/widgets/cosmic/color-scheme.slint +++ b/internal/compiler/widgets/cosmic/color-scheme.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export global ColorSchemeSelector { in property color-scheme: SlintInternal.color-scheme; diff --git a/internal/compiler/widgets/cosmic/std-widgets-impl.slint b/internal/compiler/widgets/cosmic/std-widgets-impl.slint index 4a356042c93..b65c24bc780 100644 --- a/internal/compiler/widgets/cosmic/std-widgets-impl.slint +++ b/internal/compiler/widgets/cosmic/std-widgets-impl.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics, ScrollView, Button, ListItem, Palette } from "../cosmic-base/std-widgets-impl.slint"; export { StyleMetrics, ScrollView, Button, ListItem, Palette } diff --git a/internal/compiler/widgets/cosmic/std-widgets.slint b/internal/compiler/widgets/cosmic/std-widgets.slint index e06265c52a6..790d4f736a2 100644 --- a/internal/compiler/widgets/cosmic/std-widgets.slint +++ b/internal/compiler/widgets/cosmic/std-widgets.slint @@ -1,4 +1,8 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export * from "../cosmic-base/std-widgets-base.slint"; diff --git a/internal/compiler/widgets/cupertino-base/button.slint b/internal/compiler/widgets/cupertino-base/button.slint index 97c8624878a..9ec98d296a6 100644 --- a/internal/compiler/widgets/cupertino-base/button.slint +++ b/internal/compiler/widgets/cupertino-base/button.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CupertinoFontSettings, CupertinoPalette } from "styling.slint"; import { FocusBorder } from "components.slint"; diff --git a/internal/compiler/widgets/cupertino-base/checkbox.slint b/internal/compiler/widgets/cupertino-base/checkbox.slint index 87b60e594b6..fa9c3d94b14 100644 --- a/internal/compiler/widgets/cupertino-base/checkbox.slint +++ b/internal/compiler/widgets/cupertino-base/checkbox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CupertinoFontSettings, CupertinoPalette, Icons } from "styling.slint"; import { FocusBorder } from "components.slint"; diff --git a/internal/compiler/widgets/cupertino-base/combobox.slint b/internal/compiler/widgets/cupertino-base/combobox.slint index 3537ededa13..daab50bd808 100644 --- a/internal/compiler/widgets/cupertino-base/combobox.slint +++ b/internal/compiler/widgets/cupertino-base/combobox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CupertinoFontSettings, CupertinoPalette, Icons } from "styling.slint"; import { MenuBorder, ListItem, FocusBorder } from "components.slint"; diff --git a/internal/compiler/widgets/cupertino-base/components.slint b/internal/compiler/widgets/cupertino-base/components.slint index 7a74bb4c068..0fd68cf8088 100644 --- a/internal/compiler/widgets/cupertino-base/components.slint +++ b/internal/compiler/widgets/cupertino-base/components.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CupertinoPalette, CupertinoFontSettings, Icons } from "styling.slint"; diff --git a/internal/compiler/widgets/cupertino-base/groupbox.slint b/internal/compiler/widgets/cupertino-base/groupbox.slint index 4e01dd40123..2b7a6ddc6ee 100644 --- a/internal/compiler/widgets/cupertino-base/groupbox.slint +++ b/internal/compiler/widgets/cupertino-base/groupbox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CupertinoFontSettings, CupertinoPalette } from "styling.slint"; diff --git a/internal/compiler/widgets/cupertino-base/layouts.slint b/internal/compiler/widgets/cupertino-base/layouts.slint index 6f6a37b8e31..2cdd8d531d7 100644 --- a/internal/compiler/widgets/cupertino-base/layouts.slint +++ b/internal/compiler/widgets/cupertino-base/layouts.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics } from "std-widgets-impl.slint"; diff --git a/internal/compiler/widgets/cupertino-base/lineedit.slint b/internal/compiler/widgets/cupertino-base/lineedit.slint index ba8ee8bae44..9f8106e99fb 100644 --- a/internal/compiler/widgets/cupertino-base/lineedit.slint +++ b/internal/compiler/widgets/cupertino-base/lineedit.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CupertinoFontSettings, CupertinoPalette } from "styling.slint"; import { FocusBorder } from "components.slint"; diff --git a/internal/compiler/widgets/cupertino-base/progressindicator.slint b/internal/compiler/widgets/cupertino-base/progressindicator.slint index 3f884b0fcc2..eea35770947 100644 --- a/internal/compiler/widgets/cupertino-base/progressindicator.slint +++ b/internal/compiler/widgets/cupertino-base/progressindicator.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CupertinoPalette } from "styling.slint"; diff --git a/internal/compiler/widgets/cupertino-base/scrollview.slint b/internal/compiler/widgets/cupertino-base/scrollview.slint index f2c97f20b8d..e8e307ab167 100644 --- a/internal/compiler/widgets/cupertino-base/scrollview.slint +++ b/internal/compiler/widgets/cupertino-base/scrollview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CupertinoPalette, Icons } from "styling.slint"; diff --git a/internal/compiler/widgets/cupertino-base/slider.slint b/internal/compiler/widgets/cupertino-base/slider.slint index 31120bd5607..3d9e0bfe0e4 100644 --- a/internal/compiler/widgets/cupertino-base/slider.slint +++ b/internal/compiler/widgets/cupertino-base/slider.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CupertinoPalette } from "styling.slint"; import { SliderBase } from "../common/slider-base.slint"; diff --git a/internal/compiler/widgets/cupertino-base/spinbox.slint b/internal/compiler/widgets/cupertino-base/spinbox.slint index a6dadbc5f86..0d04d4e49bb 100644 --- a/internal/compiler/widgets/cupertino-base/spinbox.slint +++ b/internal/compiler/widgets/cupertino-base/spinbox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CupertinoPalette, CupertinoFontSettings, Icons } from "styling.slint"; import { FocusBorder } from "components.slint"; diff --git a/internal/compiler/widgets/cupertino-base/spinner.slint b/internal/compiler/widgets/cupertino-base/spinner.slint index 9feef69c5c4..2b6c5ffb6ce 100644 --- a/internal/compiler/widgets/cupertino-base/spinner.slint +++ b/internal/compiler/widgets/cupertino-base/spinner.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CupertinoPalette } from "styling.slint"; import { SpinnerBase } from "../common/spinner-base.slint"; diff --git a/internal/compiler/widgets/cupertino-base/std-widgets-base.slint b/internal/compiler/widgets/cupertino-base/std-widgets-base.slint index 558dc929950..35f80f09a1c 100644 --- a/internal/compiler/widgets/cupertino-base/std-widgets-base.slint +++ b/internal/compiler/widgets/cupertino-base/std-widgets-base.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore standardbutton diff --git a/internal/compiler/widgets/cupertino-base/std-widgets-impl.slint b/internal/compiler/widgets/cupertino-base/std-widgets-impl.slint index e67a7681b8c..a25ca515665 100644 --- a/internal/compiler/widgets/cupertino-base/std-widgets-impl.slint +++ b/internal/compiler/widgets/cupertino-base/std-widgets-impl.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ColorSchemeSelector } from "color-scheme.slint"; diff --git a/internal/compiler/widgets/cupertino-base/styling.slint b/internal/compiler/widgets/cupertino-base/styling.slint index 5c704898a8c..b44d9acdbb8 100644 --- a/internal/compiler/widgets/cupertino-base/styling.slint +++ b/internal/compiler/widgets/cupertino-base/styling.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ColorSchemeSelector } from "color-scheme.slint"; diff --git a/internal/compiler/widgets/cupertino-base/switch.slint b/internal/compiler/widgets/cupertino-base/switch.slint index 83e099dbee0..44dc29611f7 100644 --- a/internal/compiler/widgets/cupertino-base/switch.slint +++ b/internal/compiler/widgets/cupertino-base/switch.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CupertinoFontSettings, CupertinoPalette } from "styling.slint"; import { FocusBorder } from "components.slint"; diff --git a/internal/compiler/widgets/cupertino-base/tableview.slint b/internal/compiler/widgets/cupertino-base/tableview.slint index ae3113ab916..0c2b8302149 100644 --- a/internal/compiler/widgets/cupertino-base/tableview.slint +++ b/internal/compiler/widgets/cupertino-base/tableview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CupertinoPalette, CupertinoFontSettings, Icons } from "styling.slint"; import { ListView } from "../common/listview.slint"; diff --git a/internal/compiler/widgets/cupertino-base/tabwidget.slint b/internal/compiler/widgets/cupertino-base/tabwidget.slint index 63220d00f11..a229435a128 100644 --- a/internal/compiler/widgets/cupertino-base/tabwidget.slint +++ b/internal/compiler/widgets/cupertino-base/tabwidget.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CupertinoPalette, CupertinoFontSettings } from "styling.slint"; import { FocusBorder } from "components.slint"; diff --git a/internal/compiler/widgets/cupertino-base/textedit.slint b/internal/compiler/widgets/cupertino-base/textedit.slint index e1e1ce2e477..ffab6d294c7 100644 --- a/internal/compiler/widgets/cupertino-base/textedit.slint +++ b/internal/compiler/widgets/cupertino-base/textedit.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { CupertinoFontSettings, CupertinoPalette } from "styling.slint"; import { ScrollBar } from "scrollview.slint"; diff --git a/internal/compiler/widgets/cupertino-dark/color-scheme.slint b/internal/compiler/widgets/cupertino-dark/color-scheme.slint index c3418941eb5..b57512f555e 100644 --- a/internal/compiler/widgets/cupertino-dark/color-scheme.slint +++ b/internal/compiler/widgets/cupertino-dark/color-scheme.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export global ColorSchemeSelector { in property color-scheme: ColorScheme.dark; diff --git a/internal/compiler/widgets/cupertino-dark/std-widgets-impl.slint b/internal/compiler/widgets/cupertino-dark/std-widgets-impl.slint index 5f62d4a1cd7..4cae4c9de89 100644 --- a/internal/compiler/widgets/cupertino-dark/std-widgets-impl.slint +++ b/internal/compiler/widgets/cupertino-dark/std-widgets-impl.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics, ScrollView, Button, ListItem, Palette } from "../cupertino-base/std-widgets-impl.slint"; export { StyleMetrics, ScrollView, Button, ListItem, Palette } diff --git a/internal/compiler/widgets/cupertino-dark/std-widgets.slint b/internal/compiler/widgets/cupertino-dark/std-widgets.slint index ff67daf8e49..47e7eb21e45 100644 --- a/internal/compiler/widgets/cupertino-dark/std-widgets.slint +++ b/internal/compiler/widgets/cupertino-dark/std-widgets.slint @@ -1,4 +1,8 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export * from "../cupertino-base/std-widgets-base.slint"; diff --git a/internal/compiler/widgets/cupertino-light/color-scheme.slint b/internal/compiler/widgets/cupertino-light/color-scheme.slint index 87a4ea37089..36bd02c6cb1 100644 --- a/internal/compiler/widgets/cupertino-light/color-scheme.slint +++ b/internal/compiler/widgets/cupertino-light/color-scheme.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export global ColorSchemeSelector { in property color-scheme: ColorScheme.light; diff --git a/internal/compiler/widgets/cupertino-light/std-widgets-impl.slint b/internal/compiler/widgets/cupertino-light/std-widgets-impl.slint index 5f62d4a1cd7..4cae4c9de89 100644 --- a/internal/compiler/widgets/cupertino-light/std-widgets-impl.slint +++ b/internal/compiler/widgets/cupertino-light/std-widgets-impl.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics, ScrollView, Button, ListItem, Palette } from "../cupertino-base/std-widgets-impl.slint"; export { StyleMetrics, ScrollView, Button, ListItem, Palette } diff --git a/internal/compiler/widgets/cupertino-light/std-widgets.slint b/internal/compiler/widgets/cupertino-light/std-widgets.slint index ff67daf8e49..47e7eb21e45 100644 --- a/internal/compiler/widgets/cupertino-light/std-widgets.slint +++ b/internal/compiler/widgets/cupertino-light/std-widgets.slint @@ -1,4 +1,8 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export * from "../cupertino-base/std-widgets-base.slint"; diff --git a/internal/compiler/widgets/cupertino/color-scheme.slint b/internal/compiler/widgets/cupertino/color-scheme.slint index 71a226e6ba1..e132f9e1c73 100644 --- a/internal/compiler/widgets/cupertino/color-scheme.slint +++ b/internal/compiler/widgets/cupertino/color-scheme.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export global ColorSchemeSelector { in property color-scheme: SlintInternal.color-scheme; diff --git a/internal/compiler/widgets/cupertino/std-widgets-impl.slint b/internal/compiler/widgets/cupertino/std-widgets-impl.slint index 5f62d4a1cd7..4cae4c9de89 100644 --- a/internal/compiler/widgets/cupertino/std-widgets-impl.slint +++ b/internal/compiler/widgets/cupertino/std-widgets-impl.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics, ScrollView, Button, ListItem, Palette } from "../cupertino-base/std-widgets-impl.slint"; export { StyleMetrics, ScrollView, Button, ListItem, Palette } diff --git a/internal/compiler/widgets/cupertino/std-widgets.slint b/internal/compiler/widgets/cupertino/std-widgets.slint index ff67daf8e49..47e7eb21e45 100644 --- a/internal/compiler/widgets/cupertino/std-widgets.slint +++ b/internal/compiler/widgets/cupertino/std-widgets.slint @@ -1,4 +1,8 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export * from "../cupertino-base/std-widgets-base.slint"; diff --git a/internal/compiler/widgets/fluent-base/button.slint b/internal/compiler/widgets/fluent-base/button.slint index 263df025c31..ea9c579229b 100644 --- a/internal/compiler/widgets/fluent-base/button.slint +++ b/internal/compiler/widgets/fluent-base/button.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { FluentFontSettings, FluentPalette } from "styling.slint"; import { FocusBorder } from "components.slint"; diff --git a/internal/compiler/widgets/fluent-base/checkbox.slint b/internal/compiler/widgets/fluent-base/checkbox.slint index 7aa20bd5f5d..84eeb3bfe33 100644 --- a/internal/compiler/widgets/fluent-base/checkbox.slint +++ b/internal/compiler/widgets/fluent-base/checkbox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { FluentFontSettings, FluentPalette, Icons } from "styling.slint"; import { FocusBorder } from "components.slint"; diff --git a/internal/compiler/widgets/fluent-base/combobox.slint b/internal/compiler/widgets/fluent-base/combobox.slint index d92f88271ab..cb63834be7c 100644 --- a/internal/compiler/widgets/fluent-base/combobox.slint +++ b/internal/compiler/widgets/fluent-base/combobox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { FluentFontSettings, FluentPalette, Icons } from "styling.slint"; import { MenuBorder, ListItem, FocusBorder } from "components.slint"; diff --git a/internal/compiler/widgets/fluent-base/components.slint b/internal/compiler/widgets/fluent-base/components.slint index f028d3fd0cf..4a17e6607ee 100644 --- a/internal/compiler/widgets/fluent-base/components.slint +++ b/internal/compiler/widgets/fluent-base/components.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { FluentPalette, FluentFontSettings } from "styling.slint"; diff --git a/internal/compiler/widgets/fluent-base/groupbox.slint b/internal/compiler/widgets/fluent-base/groupbox.slint index bc48a352233..82791920a7b 100644 --- a/internal/compiler/widgets/fluent-base/groupbox.slint +++ b/internal/compiler/widgets/fluent-base/groupbox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { FluentFontSettings, FluentPalette } from "styling.slint"; diff --git a/internal/compiler/widgets/fluent-base/layouts.slint b/internal/compiler/widgets/fluent-base/layouts.slint index 6f6a37b8e31..2cdd8d531d7 100644 --- a/internal/compiler/widgets/fluent-base/layouts.slint +++ b/internal/compiler/widgets/fluent-base/layouts.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics } from "std-widgets-impl.slint"; diff --git a/internal/compiler/widgets/fluent-base/lineedit.slint b/internal/compiler/widgets/fluent-base/lineedit.slint index 73da7c2fe44..5baf5166cac 100644 --- a/internal/compiler/widgets/fluent-base/lineedit.slint +++ b/internal/compiler/widgets/fluent-base/lineedit.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { FluentFontSettings, FluentPalette } from "styling.slint"; import { LineEditBase} from "../common/lineedit-base.slint"; diff --git a/internal/compiler/widgets/fluent-base/progressindicator.slint b/internal/compiler/widgets/fluent-base/progressindicator.slint index 9a9da45e828..14866e90876 100644 --- a/internal/compiler/widgets/fluent-base/progressindicator.slint +++ b/internal/compiler/widgets/fluent-base/progressindicator.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { FluentPalette } from "styling.slint"; diff --git a/internal/compiler/widgets/fluent-base/scrollview.slint b/internal/compiler/widgets/fluent-base/scrollview.slint index 4e7931f01e2..6b68534fc25 100644 --- a/internal/compiler/widgets/fluent-base/scrollview.slint +++ b/internal/compiler/widgets/fluent-base/scrollview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { FluentPalette, Icons } from "styling.slint"; diff --git a/internal/compiler/widgets/fluent-base/slider.slint b/internal/compiler/widgets/fluent-base/slider.slint index 6d1bb3af1c9..72fdea9d109 100644 --- a/internal/compiler/widgets/fluent-base/slider.slint +++ b/internal/compiler/widgets/fluent-base/slider.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { FluentPalette } from "styling.slint"; import { SliderBase } from "../common/slider-base.slint"; diff --git a/internal/compiler/widgets/fluent-base/spinbox.slint b/internal/compiler/widgets/fluent-base/spinbox.slint index a7138ae077f..cdbb8c262a0 100644 --- a/internal/compiler/widgets/fluent-base/spinbox.slint +++ b/internal/compiler/widgets/fluent-base/spinbox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { FluentPalette, FluentFontSettings, Icons } from "styling.slint"; import { SpinBoxBase } from "../common/spinbox-base.slint"; diff --git a/internal/compiler/widgets/fluent-base/spinner.slint b/internal/compiler/widgets/fluent-base/spinner.slint index dffbcee08da..979c71fbf32 100644 --- a/internal/compiler/widgets/fluent-base/spinner.slint +++ b/internal/compiler/widgets/fluent-base/spinner.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { FluentPalette } from "styling.slint"; import { SpinnerBase } from "../common/spinner-base.slint"; diff --git a/internal/compiler/widgets/fluent-base/std-widgets-base.slint b/internal/compiler/widgets/fluent-base/std-widgets-base.slint index 558dc929950..35f80f09a1c 100644 --- a/internal/compiler/widgets/fluent-base/std-widgets-base.slint +++ b/internal/compiler/widgets/fluent-base/std-widgets-base.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore standardbutton diff --git a/internal/compiler/widgets/fluent-base/std-widgets-impl.slint b/internal/compiler/widgets/fluent-base/std-widgets-impl.slint index 0184ad6e860..850249d2414 100644 --- a/internal/compiler/widgets/fluent-base/std-widgets-impl.slint +++ b/internal/compiler/widgets/fluent-base/std-widgets-impl.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ColorSchemeSelector } from "color-scheme.slint"; diff --git a/internal/compiler/widgets/fluent-base/styling.slint b/internal/compiler/widgets/fluent-base/styling.slint index ad0ec39c74f..8aacf6e0810 100644 --- a/internal/compiler/widgets/fluent-base/styling.slint +++ b/internal/compiler/widgets/fluent-base/styling.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ColorSchemeSelector } from "color-scheme.slint"; diff --git a/internal/compiler/widgets/fluent-base/switch.slint b/internal/compiler/widgets/fluent-base/switch.slint index 1662509da8e..149d464000d 100644 --- a/internal/compiler/widgets/fluent-base/switch.slint +++ b/internal/compiler/widgets/fluent-base/switch.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { FluentFontSettings, FluentPalette } from "styling.slint"; import { FocusBorder } from "components.slint"; diff --git a/internal/compiler/widgets/fluent-base/tableview.slint b/internal/compiler/widgets/fluent-base/tableview.slint index 297817dfe23..142165971ed 100644 --- a/internal/compiler/widgets/fluent-base/tableview.slint +++ b/internal/compiler/widgets/fluent-base/tableview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { FluentPalette, FluentFontSettings, Icons } from "styling.slint"; import { ListView } from "../common/listview.slint"; diff --git a/internal/compiler/widgets/fluent-base/tabwidget.slint b/internal/compiler/widgets/fluent-base/tabwidget.slint index 4c944b6a1a4..ccb4ddbc0e2 100644 --- a/internal/compiler/widgets/fluent-base/tabwidget.slint +++ b/internal/compiler/widgets/fluent-base/tabwidget.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { FluentPalette, FluentFontSettings } from "styling.slint"; import { FocusBorder } from "components.slint"; diff --git a/internal/compiler/widgets/fluent-base/textedit.slint b/internal/compiler/widgets/fluent-base/textedit.slint index 3d53c8fa3f8..ad249ae878f 100644 --- a/internal/compiler/widgets/fluent-base/textedit.slint +++ b/internal/compiler/widgets/fluent-base/textedit.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { FluentFontSettings, FluentPalette } from "styling.slint"; import { ScrollView } from "scrollview.slint"; diff --git a/internal/compiler/widgets/fluent-dark/color-scheme.slint b/internal/compiler/widgets/fluent-dark/color-scheme.slint index c3418941eb5..b57512f555e 100644 --- a/internal/compiler/widgets/fluent-dark/color-scheme.slint +++ b/internal/compiler/widgets/fluent-dark/color-scheme.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export global ColorSchemeSelector { in property color-scheme: ColorScheme.dark; diff --git a/internal/compiler/widgets/fluent-dark/std-widgets-impl.slint b/internal/compiler/widgets/fluent-dark/std-widgets-impl.slint index abdfa690df9..e0f5e5fe031 100644 --- a/internal/compiler/widgets/fluent-dark/std-widgets-impl.slint +++ b/internal/compiler/widgets/fluent-dark/std-widgets-impl.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics, ScrollView, Button, ListItem, Palette } from "../fluent-base/std-widgets-impl.slint"; export { StyleMetrics, ScrollView, Button, ListItem, Palette } diff --git a/internal/compiler/widgets/fluent-dark/std-widgets.slint b/internal/compiler/widgets/fluent-dark/std-widgets.slint index e1644983a3f..e2fbc8c6c66 100644 --- a/internal/compiler/widgets/fluent-dark/std-widgets.slint +++ b/internal/compiler/widgets/fluent-dark/std-widgets.slint @@ -1,4 +1,8 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export * from "../fluent-base/std-widgets-base.slint"; diff --git a/internal/compiler/widgets/fluent-light/color-scheme.slint b/internal/compiler/widgets/fluent-light/color-scheme.slint index 87a4ea37089..36bd02c6cb1 100644 --- a/internal/compiler/widgets/fluent-light/color-scheme.slint +++ b/internal/compiler/widgets/fluent-light/color-scheme.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export global ColorSchemeSelector { in property color-scheme: ColorScheme.light; diff --git a/internal/compiler/widgets/fluent-light/std-widgets-impl.slint b/internal/compiler/widgets/fluent-light/std-widgets-impl.slint index abdfa690df9..e0f5e5fe031 100644 --- a/internal/compiler/widgets/fluent-light/std-widgets-impl.slint +++ b/internal/compiler/widgets/fluent-light/std-widgets-impl.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics, ScrollView, Button, ListItem, Palette } from "../fluent-base/std-widgets-impl.slint"; export { StyleMetrics, ScrollView, Button, ListItem, Palette } diff --git a/internal/compiler/widgets/fluent-light/std-widgets.slint b/internal/compiler/widgets/fluent-light/std-widgets.slint index e1644983a3f..e2fbc8c6c66 100644 --- a/internal/compiler/widgets/fluent-light/std-widgets.slint +++ b/internal/compiler/widgets/fluent-light/std-widgets.slint @@ -1,4 +1,8 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export * from "../fluent-base/std-widgets-base.slint"; diff --git a/internal/compiler/widgets/fluent/color-scheme.slint b/internal/compiler/widgets/fluent/color-scheme.slint index 71a226e6ba1..e132f9e1c73 100644 --- a/internal/compiler/widgets/fluent/color-scheme.slint +++ b/internal/compiler/widgets/fluent/color-scheme.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export global ColorSchemeSelector { in property color-scheme: SlintInternal.color-scheme; diff --git a/internal/compiler/widgets/fluent/std-widgets-impl.slint b/internal/compiler/widgets/fluent/std-widgets-impl.slint index abdfa690df9..e0f5e5fe031 100644 --- a/internal/compiler/widgets/fluent/std-widgets-impl.slint +++ b/internal/compiler/widgets/fluent/std-widgets-impl.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics, ScrollView, Button, ListItem, Palette } from "../fluent-base/std-widgets-impl.slint"; export { StyleMetrics, ScrollView, Button, ListItem, Palette } diff --git a/internal/compiler/widgets/fluent/std-widgets.slint b/internal/compiler/widgets/fluent/std-widgets.slint index e1644983a3f..e2fbc8c6c66 100644 --- a/internal/compiler/widgets/fluent/std-widgets.slint +++ b/internal/compiler/widgets/fluent/std-widgets.slint @@ -1,4 +1,8 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export * from "../fluent-base/std-widgets-base.slint"; diff --git a/internal/compiler/widgets/material-base/button.slint b/internal/compiler/widgets/material-base/button.slint index 31bcd151ad9..1e517f4e922 100644 --- a/internal/compiler/widgets/material-base/button.slint +++ b/internal/compiler/widgets/material-base/button.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StateLayer } from "components.slint"; import { MaterialFontSettings, MaterialPalette, Elevation } from "styling.slint"; diff --git a/internal/compiler/widgets/material-base/checkbox.slint b/internal/compiler/widgets/material-base/checkbox.slint index 87b3fdb2534..ba58e938f8c 100644 --- a/internal/compiler/widgets/material-base/checkbox.slint +++ b/internal/compiler/widgets/material-base/checkbox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { MaterialPalette, MaterialFontSettings, Icons } from "styling.slint"; diff --git a/internal/compiler/widgets/material-base/combobox.slint b/internal/compiler/widgets/material-base/combobox.slint index 968fbea51df..4a40b58c604 100644 --- a/internal/compiler/widgets/material-base/combobox.slint +++ b/internal/compiler/widgets/material-base/combobox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { MaterialPalette, MaterialFontSettings, Elevation, Icons } from "styling.slint"; diff --git a/internal/compiler/widgets/material-base/components.slint b/internal/compiler/widgets/material-base/components.slint index 23c386cf333..fa0f5bcf567 100644 --- a/internal/compiler/widgets/material-base/components.slint +++ b/internal/compiler/widgets/material-base/components.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { MaterialPalette, MaterialFontSettings } from "styling.slint"; diff --git a/internal/compiler/widgets/material-base/groupbox.slint b/internal/compiler/widgets/material-base/groupbox.slint index f474f797efe..5daa30b2940 100644 --- a/internal/compiler/widgets/material-base/groupbox.slint +++ b/internal/compiler/widgets/material-base/groupbox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { MaterialPalette, MaterialFontSettings } from "styling.slint"; diff --git a/internal/compiler/widgets/material-base/layouts.slint b/internal/compiler/widgets/material-base/layouts.slint index f1fe086e322..c789969315c 100644 --- a/internal/compiler/widgets/material-base/layouts.slint +++ b/internal/compiler/widgets/material-base/layouts.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics } from "std-widgets-impl.slint"; diff --git a/internal/compiler/widgets/material-base/lineedit.slint b/internal/compiler/widgets/material-base/lineedit.slint index ca7953ce449..0afef07395c 100644 --- a/internal/compiler/widgets/material-base/lineedit.slint +++ b/internal/compiler/widgets/material-base/lineedit.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { MaterialPalette, MaterialFontSettings } from "styling.slint"; import { LineEditBase} from "../common/lineedit-base.slint"; diff --git a/internal/compiler/widgets/material-base/progressindicator.slint b/internal/compiler/widgets/material-base/progressindicator.slint index 6a334510342..c8b53acd5de 100644 --- a/internal/compiler/widgets/material-base/progressindicator.slint +++ b/internal/compiler/widgets/material-base/progressindicator.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { MaterialPalette } from "styling.slint"; diff --git a/internal/compiler/widgets/material-base/scrollview.slint b/internal/compiler/widgets/material-base/scrollview.slint index 6e2f43af7a8..91f262aeb86 100644 --- a/internal/compiler/widgets/material-base/scrollview.slint +++ b/internal/compiler/widgets/material-base/scrollview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { MaterialPalette } from "styling.slint"; diff --git a/internal/compiler/widgets/material-base/slider.slint b/internal/compiler/widgets/material-base/slider.slint index b32c7fecccf..af61105ecbc 100644 --- a/internal/compiler/widgets/material-base/slider.slint +++ b/internal/compiler/widgets/material-base/slider.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { MaterialPalette, Elevation } from "styling.slint"; diff --git a/internal/compiler/widgets/material-base/spinbox.slint b/internal/compiler/widgets/material-base/spinbox.slint index e4e94612f86..4f6a9c70b9b 100644 --- a/internal/compiler/widgets/material-base/spinbox.slint +++ b/internal/compiler/widgets/material-base/spinbox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { MaterialPalette, MaterialFontSettings, Icons } from "styling.slint"; import { SpinBoxBase } from "../common/spinbox-base.slint"; diff --git a/internal/compiler/widgets/material-base/spinner.slint b/internal/compiler/widgets/material-base/spinner.slint index 0c47ec757bc..3996b00d2c4 100644 --- a/internal/compiler/widgets/material-base/spinner.slint +++ b/internal/compiler/widgets/material-base/spinner.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { MaterialPalette } from "styling.slint"; import { SpinnerBase } from "../common/spinner-base.slint"; diff --git a/internal/compiler/widgets/material-base/std-widgets-base.slint b/internal/compiler/widgets/material-base/std-widgets-base.slint index 671571bda87..edb3ceb0d16 100644 --- a/internal/compiler/widgets/material-base/std-widgets-base.slint +++ b/internal/compiler/widgets/material-base/std-widgets-base.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore standardbutton diff --git a/internal/compiler/widgets/material-base/std-widgets-impl.slint b/internal/compiler/widgets/material-base/std-widgets-impl.slint index ee22c415141..70ee49bb0a8 100644 --- a/internal/compiler/widgets/material-base/std-widgets-impl.slint +++ b/internal/compiler/widgets/material-base/std-widgets-impl.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // widget imports import { Button } from "button.slint"; diff --git a/internal/compiler/widgets/material-base/styling.slint b/internal/compiler/widgets/material-base/styling.slint index 410e5fca5e0..20ad2257c35 100644 --- a/internal/compiler/widgets/material-base/styling.slint +++ b/internal/compiler/widgets/material-base/styling.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ColorSchemeSelector } from "color-scheme.slint"; diff --git a/internal/compiler/widgets/material-base/switch.slint b/internal/compiler/widgets/material-base/switch.slint index 5ceabdc8c8e..88cbb5b8296 100644 --- a/internal/compiler/widgets/material-base/switch.slint +++ b/internal/compiler/widgets/material-base/switch.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { MaterialPalette, MaterialFontSettings } from "styling.slint"; diff --git a/internal/compiler/widgets/material-base/tableview.slint b/internal/compiler/widgets/material-base/tableview.slint index 50479bc31ab..0bf45b37a4b 100644 --- a/internal/compiler/widgets/material-base/tableview.slint +++ b/internal/compiler/widgets/material-base/tableview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ListView } from "../common/listview.slint"; import { StateLayer } from "components.slint"; diff --git a/internal/compiler/widgets/material-base/tabwidget.slint b/internal/compiler/widgets/material-base/tabwidget.slint index 34751b999a0..2dc88721155 100644 --- a/internal/compiler/widgets/material-base/tabwidget.slint +++ b/internal/compiler/widgets/material-base/tabwidget.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { MaterialPalette, MaterialFontSettings } from "styling.slint"; diff --git a/internal/compiler/widgets/material-dark/color-scheme.slint b/internal/compiler/widgets/material-dark/color-scheme.slint index c3418941eb5..b57512f555e 100644 --- a/internal/compiler/widgets/material-dark/color-scheme.slint +++ b/internal/compiler/widgets/material-dark/color-scheme.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export global ColorSchemeSelector { in property color-scheme: ColorScheme.dark; diff --git a/internal/compiler/widgets/material-dark/std-widgets-impl.slint b/internal/compiler/widgets/material-dark/std-widgets-impl.slint index 831e18b29aa..263b5000848 100644 --- a/internal/compiler/widgets/material-dark/std-widgets-impl.slint +++ b/internal/compiler/widgets/material-dark/std-widgets-impl.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics, ScrollView, Button, ListItem, Palette } from "../material-base/std-widgets-impl.slint"; export { StyleMetrics, ScrollView, Button, ListItem, Palette } diff --git a/internal/compiler/widgets/material-dark/std-widgets.slint b/internal/compiler/widgets/material-dark/std-widgets.slint index ed984469091..19e88101e58 100644 --- a/internal/compiler/widgets/material-dark/std-widgets.slint +++ b/internal/compiler/widgets/material-dark/std-widgets.slint @@ -1,4 +1,8 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export * from "../material-base/std-widgets-base.slint"; diff --git a/internal/compiler/widgets/material-light/color-scheme.slint b/internal/compiler/widgets/material-light/color-scheme.slint index 87a4ea37089..36bd02c6cb1 100644 --- a/internal/compiler/widgets/material-light/color-scheme.slint +++ b/internal/compiler/widgets/material-light/color-scheme.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export global ColorSchemeSelector { in property color-scheme: ColorScheme.light; diff --git a/internal/compiler/widgets/material-light/std-widgets-impl.slint b/internal/compiler/widgets/material-light/std-widgets-impl.slint index 831e18b29aa..263b5000848 100644 --- a/internal/compiler/widgets/material-light/std-widgets-impl.slint +++ b/internal/compiler/widgets/material-light/std-widgets-impl.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics, ScrollView, Button, ListItem, Palette } from "../material-base/std-widgets-impl.slint"; export { StyleMetrics, ScrollView, Button, ListItem, Palette } diff --git a/internal/compiler/widgets/material-light/std-widgets.slint b/internal/compiler/widgets/material-light/std-widgets.slint index ed984469091..19e88101e58 100644 --- a/internal/compiler/widgets/material-light/std-widgets.slint +++ b/internal/compiler/widgets/material-light/std-widgets.slint @@ -1,4 +1,8 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export * from "../material-base/std-widgets-base.slint"; diff --git a/internal/compiler/widgets/material/color-scheme.slint b/internal/compiler/widgets/material/color-scheme.slint index 71a226e6ba1..e132f9e1c73 100644 --- a/internal/compiler/widgets/material/color-scheme.slint +++ b/internal/compiler/widgets/material/color-scheme.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export global ColorSchemeSelector { in property color-scheme: SlintInternal.color-scheme; diff --git a/internal/compiler/widgets/material/std-widgets-impl.slint b/internal/compiler/widgets/material/std-widgets-impl.slint index 52e298f1675..06ec59f514f 100644 --- a/internal/compiler/widgets/material/std-widgets-impl.slint +++ b/internal/compiler/widgets/material/std-widgets-impl.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics, ScrollView, Button, Switch, ListItem, Palette } from "../material-base/std-widgets-impl.slint"; export { StyleMetrics, ScrollView, Button, Switch, ListItem, Palette } diff --git a/internal/compiler/widgets/material/std-widgets.slint b/internal/compiler/widgets/material/std-widgets.slint index ed984469091..19e88101e58 100644 --- a/internal/compiler/widgets/material/std-widgets.slint +++ b/internal/compiler/widgets/material/std-widgets.slint @@ -1,4 +1,8 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export * from "../material-base/std-widgets-base.slint"; diff --git a/internal/compiler/widgets/qt/button.slint b/internal/compiler/widgets/qt/button.slint index 5b4519b3f61..466b6fa8199 100644 --- a/internal/compiler/widgets/qt/button.slint +++ b/internal/compiler/widgets/qt/button.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component Button { in property text <=> native.text; diff --git a/internal/compiler/widgets/qt/checkbox.slint b/internal/compiler/widgets/qt/checkbox.slint index 9c9dde278ec..1cf2af64df0 100644 --- a/internal/compiler/widgets/qt/checkbox.slint +++ b/internal/compiler/widgets/qt/checkbox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component CheckBox inherits NativeCheckBox { accessible-checkable: true; diff --git a/internal/compiler/widgets/qt/combobox.slint b/internal/compiler/widgets/qt/combobox.slint index 52b4a88e113..6a6cba4e1cb 100644 --- a/internal/compiler/widgets/qt/combobox.slint +++ b/internal/compiler/widgets/qt/combobox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ComboBoxBase } from "../common/combobox-base.slint"; diff --git a/internal/compiler/widgets/qt/groupbox.slint b/internal/compiler/widgets/qt/groupbox.slint index 099480c8249..841b7e849a4 100644 --- a/internal/compiler/widgets/qt/groupbox.slint +++ b/internal/compiler/widgets/qt/groupbox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component GroupBox { in property title <=> native.title; diff --git a/internal/compiler/widgets/qt/internal-scrollview.slint b/internal/compiler/widgets/qt/internal-scrollview.slint index 36da4bc5b05..a7cc118da27 100644 --- a/internal/compiler/widgets/qt/internal-scrollview.slint +++ b/internal/compiler/widgets/qt/internal-scrollview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export { NativeStyleMetrics as StyleMetrics } diff --git a/internal/compiler/widgets/qt/layouts.slint b/internal/compiler/widgets/qt/layouts.slint index 30d838247b3..86cbdc2bcdb 100644 --- a/internal/compiler/widgets/qt/layouts.slint +++ b/internal/compiler/widgets/qt/layouts.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component VerticalBox inherits VerticalLayout { spacing: NativeStyleMetrics.layout-spacing; diff --git a/internal/compiler/widgets/qt/lineedit.slint b/internal/compiler/widgets/qt/lineedit.slint index e1653d937d3..63c3b7595ae 100644 --- a/internal/compiler/widgets/qt/lineedit.slint +++ b/internal/compiler/widgets/qt/lineedit.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { LineEditBase} from "../common/lineedit-base.slint"; import { StyleMetrics } from "std-widgets-impl.slint"; diff --git a/internal/compiler/widgets/qt/progressindicator.slint b/internal/compiler/widgets/qt/progressindicator.slint index 778def6ff4e..2a520f6e331 100644 --- a/internal/compiler/widgets/qt/progressindicator.slint +++ b/internal/compiler/widgets/qt/progressindicator.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component ProgressIndicator inherits NativeProgressIndicator { accessible-role: progress-indicator; diff --git a/internal/compiler/widgets/qt/scrollview.slint b/internal/compiler/widgets/qt/scrollview.slint index 0f1e0cc5123..aa8faa92e74 100644 --- a/internal/compiler/widgets/qt/scrollview.slint +++ b/internal/compiler/widgets/qt/scrollview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { InternalScrollView } from "internal-scrollview.slint"; diff --git a/internal/compiler/widgets/qt/slider.slint b/internal/compiler/widgets/qt/slider.slint index 2e160c9a284..49b6f1ea8d0 100644 --- a/internal/compiler/widgets/qt/slider.slint +++ b/internal/compiler/widgets/qt/slider.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component Slider inherits NativeSlider { accessible-role: slider; diff --git a/internal/compiler/widgets/qt/spinbox.slint b/internal/compiler/widgets/qt/spinbox.slint index 4835a7e66cc..a946d94043c 100644 --- a/internal/compiler/widgets/qt/spinbox.slint +++ b/internal/compiler/widgets/qt/spinbox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component SpinBox inherits NativeSpinBox { accessible-role: spinbox; diff --git a/internal/compiler/widgets/qt/spinner.slint b/internal/compiler/widgets/qt/spinner.slint index f735bbdd1db..511076c37dc 100644 --- a/internal/compiler/widgets/qt/spinner.slint +++ b/internal/compiler/widgets/qt/spinner.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component Spinner { in property progress; diff --git a/internal/compiler/widgets/qt/std-widgets-impl.slint b/internal/compiler/widgets/qt/std-widgets-impl.slint index 5dce93f4bd8..2bb2465de41 100644 --- a/internal/compiler/widgets/qt/std-widgets-impl.slint +++ b/internal/compiler/widgets/qt/std-widgets-impl.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export { NativeStyleMetrics as StyleMetrics } export { NativePalette as Palette } diff --git a/internal/compiler/widgets/qt/std-widgets.slint b/internal/compiler/widgets/qt/std-widgets.slint index efc0cc15293..d70384fa3e5 100644 --- a/internal/compiler/widgets/qt/std-widgets.slint +++ b/internal/compiler/widgets/qt/std-widgets.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { TextEdit, AboutSlint } from "../common/common.slint"; import { StyleMetrics, ScrollView, Palette } from "std-widgets-impl.slint"; diff --git a/internal/compiler/widgets/qt/switch.slint b/internal/compiler/widgets/qt/switch.slint index fad5e48dde1..5b03b3ba923 100644 --- a/internal/compiler/widgets/qt/switch.slint +++ b/internal/compiler/widgets/qt/switch.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component Switch inherits NativeCheckBox { accessible-checkable: true; diff --git a/internal/compiler/widgets/qt/tableview.slint b/internal/compiler/widgets/qt/tableview.slint index d02d5bc40c2..59245f75a94 100644 --- a/internal/compiler/widgets/qt/tableview.slint +++ b/internal/compiler/widgets/qt/tableview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ListView } from "internal-scrollview.slint"; diff --git a/internal/compiler/widgets/qt/tabwidget.slint b/internal/compiler/widgets/qt/tabwidget.slint index 62bf568e522..8aa82909871 100644 --- a/internal/compiler/widgets/qt/tabwidget.slint +++ b/internal/compiler/widgets/qt/tabwidget.slint @@ -1,7 +1,11 @@ // Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial import { TabBarBase } from "../common/tabwidget-base.slint"; +======= +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TabWidgetImpl inherits NativeTabWidget { } diff --git a/internal/core-macros/Cargo.toml b/internal/core-macros/Cargo.toml index c2818f337ff..34efdd985cb 100644 --- a/internal/core-macros/Cargo.toml +++ b/internal/core-macros/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "i-slint-core-macros" diff --git a/internal/core-macros/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/internal/core-macros/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..4225e094c5d --- /dev/null +++ b/internal/core-macros/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/internal/core-macros/README.md b/internal/core-macros/README.md index dc09cdee019..61c70f466b2 100644 --- a/internal/core-macros/README.md +++ b/internal/core-macros/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 This crate contains the internal procedural macros used by the i-slint-core crate diff --git a/internal/core-macros/lib.rs b/internal/core-macros/lib.rs index 73359a9939b..41636cd214c 100644 --- a/internal/core-macros/lib.rs +++ b/internal/core-macros/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![doc = include_str!("README.md")] #![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")] diff --git a/internal/core/Cargo.toml b/internal/core/Cargo.toml index 14fbf31288e..366ac59671e 100644 --- a/internal/core/Cargo.toml +++ b/internal/core/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "i-slint-core" diff --git a/internal/core/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/internal/core/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..4225e094c5d --- /dev/null +++ b/internal/core/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/internal/core/README.md b/internal/core/README.md index 28c12c3321d..8bbee4a05b3 100644 --- a/internal/core/README.md +++ b/internal/core/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Slint Runtime Library diff --git a/internal/core/accessibility.rs b/internal/core/accessibility.rs index a03f314d258..dee0e871711 100644 --- a/internal/core/accessibility.rs +++ b/internal/core/accessibility.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore descendents diff --git a/internal/core/animations.rs b/internal/core/animations.rs index d180b57bf61..fad19953af2 100644 --- a/internal/core/animations.rs +++ b/internal/core/animations.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![warn(missing_docs)] //! The animation system diff --git a/internal/core/api.rs b/internal/core/api.rs index 6e8b4fb099b..84b6fc0caf2 100644 --- a/internal/core/api.rs +++ b/internal/core/api.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This module contains types that are public and re-exported in the slint-rs as well as the slint-interpreter crate as public API. diff --git a/internal/core/callbacks.rs b/internal/core/callbacks.rs index 56918c865c1..0ad22f5904a 100644 --- a/internal/core/callbacks.rs +++ b/internal/core/callbacks.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! Callback that can be connected to one single handler. diff --git a/internal/core/component_factory.rs b/internal/core/component_factory.rs index 12edc233d33..58c3acfa892 100644 --- a/internal/core/component_factory.rs +++ b/internal/core/component_factory.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![warn(missing_docs)] diff --git a/internal/core/context.rs b/internal/core/context.rs index 764713250ad..9fff95957a5 100644 --- a/internal/core/context.rs +++ b/internal/core/context.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::api::PlatformError; use crate::platform::{EventLoopProxy, Platform}; diff --git a/internal/core/future.rs b/internal/core/future.rs index 37c3ddb8334..b99aed50ef0 100644 --- a/internal/core/future.rs +++ b/internal/core/future.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![cfg(target_has_atomic = "ptr")] // Arc is not available. TODO: implement using RawWarker #![warn(missing_docs)] diff --git a/internal/core/graphics.rs b/internal/core/graphics.rs index eed520af8b0..0b840beaf7d 100644 --- a/internal/core/graphics.rs +++ b/internal/core/graphics.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![warn(missing_docs)] /*! diff --git a/internal/core/graphics/bitmapfont.rs b/internal/core/graphics/bitmapfont.rs index 4b69053f112..efa0a349dc7 100644 --- a/internal/core/graphics/bitmapfont.rs +++ b/internal/core/graphics/bitmapfont.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::slice::Slice; diff --git a/internal/core/graphics/border_radius.rs b/internal/core/graphics/border_radius.rs index a8a338a5580..abd29897f2e 100644 --- a/internal/core/graphics/border_radius.rs +++ b/internal/core/graphics/border_radius.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This module contains border radius related types for the run-time library. diff --git a/internal/core/graphics/boxshadowcache.rs b/internal/core/graphics/boxshadowcache.rs index 64c1167c5ab..6b41261e66e 100644 --- a/internal/core/graphics/boxshadowcache.rs +++ b/internal/core/graphics/boxshadowcache.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This module contains a cache helper for caching box shadow textures. diff --git a/internal/core/graphics/brush.rs b/internal/core/graphics/brush.rs index 686d1fd65e6..3d5a0bcc871 100644 --- a/internal/core/graphics/brush.rs +++ b/internal/core/graphics/brush.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This module contains brush related types for the run-time library. diff --git a/internal/core/graphics/color.rs b/internal/core/graphics/color.rs index e90eaa2e55f..9b2a1942c6b 100644 --- a/internal/core/graphics/color.rs +++ b/internal/core/graphics/color.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This module contains color related types for the run-time library. diff --git a/internal/core/graphics/image.rs b/internal/core/graphics/image.rs index 616d40a2891..81efbd15412 100644 --- a/internal/core/graphics/image.rs +++ b/internal/core/graphics/image.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This module contains image decoding and caching related types for the run-time library. diff --git a/internal/core/graphics/image/cache.rs b/internal/core/graphics/image/cache.rs index 1be0610d9a2..4742b7d41d9 100644 --- a/internal/core/graphics/image/cache.rs +++ b/internal/core/graphics/image/cache.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This module contains image and caching related types for the run-time library. diff --git a/internal/core/graphics/image/htmlimage.rs b/internal/core/graphics/image/htmlimage.rs index 16b6dfe9273..03b719a036a 100644 --- a/internal/core/graphics/image/htmlimage.rs +++ b/internal/core/graphics/image/htmlimage.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use alloc::rc::Rc; diff --git a/internal/core/graphics/image/svg.rs b/internal/core/graphics/image/svg.rs index d959d0533a3..3f159ae0127 100644 --- a/internal/core/graphics/image/svg.rs +++ b/internal/core/graphics/image/svg.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![cfg(feature = "svg")] diff --git a/internal/core/graphics/path.rs b/internal/core/graphics/path.rs index 7b62a342f22..f66dc4aa514 100644 --- a/internal/core/graphics/path.rs +++ b/internal/core/graphics/path.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This module contains path related types and functions for the run-time library. diff --git a/internal/core/graphics/rendering_metrics_collector.rs b/internal/core/graphics/rendering_metrics_collector.rs index 8fb6693ef69..fc93e20816a 100644 --- a/internal/core/graphics/rendering_metrics_collector.rs +++ b/internal/core/graphics/rendering_metrics_collector.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This module contains a simple helper type to measure the average number of frames rendered per second. diff --git a/internal/core/input.rs b/internal/core/input.rs index 5ed66723003..86418061c95 100644 --- a/internal/core/input.rs +++ b/internal/core/input.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! Module handling mouse events */ diff --git a/internal/core/item_focus.rs b/internal/core/item_focus.rs index 2a8e15b87e5..287c4c6f096 100644 --- a/internal/core/item_focus.rs +++ b/internal/core/item_focus.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore nesw diff --git a/internal/core/item_rendering.rs b/internal/core/item_rendering.rs index b7ab20fb4eb..e3813753361 100644 --- a/internal/core/item_rendering.rs +++ b/internal/core/item_rendering.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![warn(missing_docs)] //! module for rendering the tree of items diff --git a/internal/core/item_tree.rs b/internal/core/item_tree.rs index f6bd5a4a411..c1309f40ab6 100644 --- a/internal/core/item_tree.rs +++ b/internal/core/item_tree.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore xffff diff --git a/internal/core/items.rs b/internal/core/items.rs index f20777fdd98..e2d31d51269 100644 --- a/internal/core/items.rs +++ b/internal/core/items.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore nesw diff --git a/internal/core/items/component_container.rs b/internal/core/items/component_container.rs index 83119c79c55..31be43af4b4 100644 --- a/internal/core/items/component_container.rs +++ b/internal/core/items/component_container.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This module contains the builtin `ComponentContainer` and related items diff --git a/internal/core/items/flickable.rs b/internal/core/items/flickable.rs index 609add3f273..f868f30b403 100644 --- a/internal/core/items/flickable.rs +++ b/internal/core/items/flickable.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! The implementation details behind the Flickable diff --git a/internal/core/items/image.rs b/internal/core/items/image.rs index 90f76073809..d7507b8fa7c 100644 --- a/internal/core/items/image.rs +++ b/internal/core/items/image.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This module contains the builtin image related items. diff --git a/internal/core/items/path.rs b/internal/core/items/path.rs index 1d4e4aefb19..c5b9c4764b9 100644 --- a/internal/core/items/path.rs +++ b/internal/core/items/path.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This module contains the builtin Path related items. diff --git a/internal/core/items/text.rs b/internal/core/items/text.rs index 9526bba89c0..a754bb8b276 100644 --- a/internal/core/items/text.rs +++ b/internal/core/items/text.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This module contains the builtin text related items. diff --git a/internal/core/layout.rs b/internal/core/layout.rs index 4d311c933f8..6870af1b3b7 100644 --- a/internal/core/layout.rs +++ b/internal/core/layout.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Runtime support for layouts. diff --git a/internal/core/lengths.rs b/internal/core/lengths.rs index b20dcafad21..07cd40ad398 100644 --- a/internal/core/lengths.rs +++ b/internal/core/lengths.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::BorderRadius; use crate::Coord; diff --git a/internal/core/lib.rs b/internal/core/lib.rs index 6cc0b36713c..29883b8aec8 100644 --- a/internal/core/lib.rs +++ b/internal/core/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore sharedvector textlayout diff --git a/internal/core/model.rs b/internal/core/model.rs index df2cb2ea116..540eebec67d 100644 --- a/internal/core/model.rs +++ b/internal/core/model.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore vecmodel diff --git a/internal/core/model/adapters.rs b/internal/core/model/adapters.rs index 2603c0cc5f3..1a5e0a50007 100644 --- a/internal/core/model/adapters.rs +++ b/internal/core/model/adapters.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This module contains adapter models. diff --git a/internal/core/model/model_peer.rs b/internal/core/model/model_peer.rs index cbd568f2e00..e47968b24c6 100644 --- a/internal/core/model/model_peer.rs +++ b/internal/core/model/model_peer.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This module contains the implementation of the model change tracking. diff --git a/internal/core/platform.rs b/internal/core/platform.rs index 03df2445b46..bffb555953f 100644 --- a/internal/core/platform.rs +++ b/internal/core/platform.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! The backend is the abstraction for crates that need to do the actual drawing and event loop diff --git a/internal/core/properties.rs b/internal/core/properties.rs index d80097d9250..13bbc5cbe04 100644 --- a/internal/core/properties.rs +++ b/internal/core/properties.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! Property binding engine. diff --git a/internal/core/properties/ffi.rs b/internal/core/properties/ffi.rs index e627af78a6a..54566cb3622 100644 --- a/internal/core/properties/ffi.rs +++ b/internal/core/properties/ffi.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use super::*; use crate::graphics::{Brush, Color}; diff --git a/internal/core/properties/properties_animations.rs b/internal/core/properties/properties_animations.rs index a5276238630..79a2bfb315b 100644 --- a/internal/core/properties/properties_animations.rs +++ b/internal/core/properties/properties_animations.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use super::*; use crate::{items::PropertyAnimation, lengths::LogicalLength}; diff --git a/internal/core/renderer.rs b/internal/core/renderer.rs index 599ca9ff06c..d6d1462000a 100644 --- a/internal/core/renderer.rs +++ b/internal/core/renderer.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #[cfg(not(feature = "std"))] use alloc::boxed::Box; diff --git a/internal/core/rtti.rs b/internal/core/rtti.rs index b50a1abee01..190a6652be8 100644 --- a/internal/core/rtti.rs +++ b/internal/core/rtti.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This module enable runtime type information for the builtin items and diff --git a/internal/core/sharedvector.rs b/internal/core/sharedvector.rs index 8ff5ff5767d..ecfd5c47962 100644 --- a/internal/core/sharedvector.rs +++ b/internal/core/sharedvector.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! module for the SharedVector and related things #![allow(unsafe_code)] diff --git a/internal/core/slice.rs b/internal/core/slice.rs index 60f42d9736e..90974c3e9f7 100644 --- a/internal/core/slice.rs +++ b/internal/core/slice.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! FFI-friendly slice diff --git a/internal/core/software_renderer.rs b/internal/core/software_renderer.rs index ba98f4ab96c..2b349a757fa 100644 --- a/internal/core/software_renderer.rs +++ b/internal/core/software_renderer.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This module contains the [`SoftwareRenderer`] and related types. //! diff --git a/internal/core/software_renderer/draw_functions.rs b/internal/core/software_renderer/draw_functions.rs index 78a2ebc476d..b7fe3781f0b 100644 --- a/internal/core/software_renderer/draw_functions.rs +++ b/internal/core/software_renderer/draw_functions.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![allow(clippy::identity_op)] // We use x + 0 a lot here for symmetry diff --git a/internal/core/software_renderer/fixed.rs b/internal/core/software_renderer/fixed.rs index d752f7bc6e4..e3c3cb048a7 100644 --- a/internal/core/software_renderer/fixed.rs +++ b/internal/core/software_renderer/fixed.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /// A Fixed point, represented with the T underlying type, and shifted by so many bits #[derive(Default, Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)] diff --git a/internal/core/software_renderer/fonts.rs b/internal/core/software_renderer/fonts.rs index 920f559044c..aae8b7a0592 100644 --- a/internal/core/software_renderer/fonts.rs +++ b/internal/core/software_renderer/fonts.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use alloc::rc::Rc; #[cfg(not(feature = "std"))] diff --git a/internal/core/software_renderer/fonts/pixelfont.rs b/internal/core/software_renderer/fonts/pixelfont.rs index 0fb962f5e5a..7ea4030db04 100644 --- a/internal/core/software_renderer/fonts/pixelfont.rs +++ b/internal/core/software_renderer/fonts/pixelfont.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::{ graphics::{BitmapFont, BitmapGlyphs}, diff --git a/internal/core/software_renderer/fonts/systemfonts.rs b/internal/core/software_renderer/fonts/systemfonts.rs index beab4db251c..be5c095f180 100644 --- a/internal/core/software_renderer/fonts/systemfonts.rs +++ b/internal/core/software_renderer/fonts/systemfonts.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use core::cell::RefCell; diff --git a/internal/core/software_renderer/fonts/vectorfont.rs b/internal/core/software_renderer/fonts/vectorfont.rs index 09303f9725e..b7d2ca2e9fc 100644 --- a/internal/core/software_renderer/fonts/vectorfont.rs +++ b/internal/core/software_renderer/fonts/vectorfont.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use alloc::rc::Rc; diff --git a/internal/core/string.rs b/internal/core/string.rs index 30563836eec..c601ef2e709 100644 --- a/internal/core/string.rs +++ b/internal/core/string.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! module for the SharedString and related things diff --git a/internal/core/tests.rs b/internal/core/tests.rs index c6644171ee4..24e68ea85d8 100644 --- a/internal/core/tests.rs +++ b/internal/core/tests.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Functions useful for testing #![warn(missing_docs)] diff --git a/internal/core/textlayout.rs b/internal/core/textlayout.rs index 27d7dd7a394..63083bd8860 100644 --- a/internal/core/textlayout.rs +++ b/internal/core/textlayout.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! module for basic text layout //! diff --git a/internal/core/textlayout/fragments.rs b/internal/core/textlayout/fragments.rs index d2161bf782a..f035f1c935b 100644 --- a/internal/core/textlayout/fragments.rs +++ b/internal/core/textlayout/fragments.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use core::ops::Range; diff --git a/internal/core/textlayout/glyphclusters.rs b/internal/core/textlayout/glyphclusters.rs index e0cc871e1cc..2e11e5bf75c 100644 --- a/internal/core/textlayout/glyphclusters.rs +++ b/internal/core/textlayout/glyphclusters.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use core::{marker::PhantomData, ops::Range}; diff --git a/internal/core/textlayout/linebreak_simple.rs b/internal/core/textlayout/linebreak_simple.rs index 883bc3b259d..b666920371d 100644 --- a/internal/core/textlayout/linebreak_simple.rs +++ b/internal/core/textlayout/linebreak_simple.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #[derive(Copy, Clone, PartialEq, Eq, Debug)] pub enum BreakOpportunity { diff --git a/internal/core/textlayout/linebreak_unicode.rs b/internal/core/textlayout/linebreak_unicode.rs index e5acef1331d..cd0b5abbf1d 100644 --- a/internal/core/textlayout/linebreak_unicode.rs +++ b/internal/core/textlayout/linebreak_unicode.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use core::marker::PhantomData; diff --git a/internal/core/textlayout/linebreaker.rs b/internal/core/textlayout/linebreaker.rs index 2ddfdd934ff..69dfb033011 100644 --- a/internal/core/textlayout/linebreaker.rs +++ b/internal/core/textlayout/linebreaker.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use core::ops::Range; diff --git a/internal/core/textlayout/shaping.rs b/internal/core/textlayout/shaping.rs index 3bca4ae5295..daab7faa9a5 100644 --- a/internal/core/textlayout/shaping.rs +++ b/internal/core/textlayout/shaping.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #[cfg(not(feature = "std"))] use alloc::vec::Vec; diff --git a/internal/core/timers.rs b/internal/core/timers.rs index 4bd379e04ec..a4cf169a069 100644 --- a/internal/core/timers.rs +++ b/internal/core/timers.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore singleshot diff --git a/internal/core/translations.rs b/internal/core/translations.rs index b11ab29a7dd..c7e766b1f08 100644 --- a/internal/core/translations.rs +++ b/internal/core/translations.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::SharedString; use core::fmt::Display; diff --git a/internal/core/unsafe_single_threaded.rs b/internal/core/unsafe_single_threaded.rs index ea2942bafb7..7ba27c3e346 100644 --- a/internal/core/unsafe_single_threaded.rs +++ b/internal/core/unsafe_single_threaded.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Unsafe module that is only enabled when the `std` feature is off. //! It re-implements the thread_local macro with statics diff --git a/internal/core/window.rs b/internal/core/window.rs index 3f2192fda76..59d002d37eb 100644 --- a/internal/core/window.rs +++ b/internal/core/window.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore backtab diff --git a/internal/interpreter/Cargo.toml b/internal/interpreter/Cargo.toml index 8e3d27f5ab6..e4c0899b703 100644 --- a/internal/interpreter/Cargo.toml +++ b/internal/interpreter/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "slint-interpreter" diff --git a/internal/interpreter/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/internal/interpreter/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..4225e094c5d --- /dev/null +++ b/internal/interpreter/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/internal/interpreter/api.rs b/internal/interpreter/api.rs index ab452cd1e47..991e0bc3d29 100644 --- a/internal/interpreter/api.rs +++ b/internal/interpreter/api.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_compiler::diagnostics::SourceFileVersion; use i_slint_compiler::langtype::Type as LangType; diff --git a/internal/interpreter/dynamic_item_tree.rs b/internal/interpreter/dynamic_item_tree.rs index 890c2c48d12..44778eaca9f 100644 --- a/internal/interpreter/dynamic_item_tree.rs +++ b/internal/interpreter/dynamic_item_tree.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::{api::Value, dynamic_type, eval}; diff --git a/internal/interpreter/dynamic_type.rs b/internal/interpreter/dynamic_type.rs index ae6499ab607..81802c7d45c 100644 --- a/internal/interpreter/dynamic_type.rs +++ b/internal/interpreter/dynamic_type.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! This module create dynamic types diff --git a/internal/interpreter/eval.rs b/internal/interpreter/eval.rs index a9c49d74f5f..d7e19609c58 100644 --- a/internal/interpreter/eval.rs +++ b/internal/interpreter/eval.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::api::{SetPropertyError, Struct, Value}; use crate::dynamic_item_tree::InstanceRef; diff --git a/internal/interpreter/eval_layout.rs b/internal/interpreter/eval_layout.rs index 5e70b812913..987f199e0ef 100644 --- a/internal/interpreter/eval_layout.rs +++ b/internal/interpreter/eval_layout.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::dynamic_item_tree::InstanceRef; use crate::eval::{self, ComponentInstance, EvalLocalContext}; diff --git a/internal/interpreter/ffi.rs b/internal/interpreter/ffi.rs index 158007e8285..644439a4a41 100644 --- a/internal/interpreter/ffi.rs +++ b/internal/interpreter/ffi.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::dynamic_item_tree::ErasedItemTreeBox; diff --git a/internal/interpreter/global_component.rs b/internal/interpreter/global_component.rs index cb2b0df84cd..59f1ffa54a0 100644 --- a/internal/interpreter/global_component.rs +++ b/internal/interpreter/global_component.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use core::pin::Pin; use std::collections::{BTreeMap, HashMap}; diff --git a/internal/interpreter/highlight.rs b/internal/interpreter/highlight.rs index 0788660fd95..bc68e602e58 100644 --- a/internal/interpreter/highlight.rs +++ b/internal/interpreter/highlight.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This module contains the code for the highlight of some elements diff --git a/internal/interpreter/lib.rs b/internal/interpreter/lib.rs index d4ecae83518..6eade828612 100644 --- a/internal/interpreter/lib.rs +++ b/internal/interpreter/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! # Slint interpreter library diff --git a/internal/interpreter/migration.rs b/internal/interpreter/migration.rs index d02b35ebb74..aaf44e8cb8f 100644 --- a/internal/interpreter/migration.rs +++ b/internal/interpreter/migration.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! # Migration from previous versions diff --git a/internal/interpreter/tests.rs b/internal/interpreter/tests.rs index efd0b8fb29e..70f4d875239 100644 --- a/internal/interpreter/tests.rs +++ b/internal/interpreter/tests.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #[cfg(feature = "internal")] #[test] diff --git a/internal/interpreter/value_model.rs b/internal/interpreter/value_model.rs index 335a58ef829..f237c5d9ecc 100644 --- a/internal/interpreter/value_model.rs +++ b/internal/interpreter/value_model.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::api::Value; use i_slint_core::model::{Model, ModelTracker}; diff --git a/internal/renderers/femtovg/Cargo.toml b/internal/renderers/femtovg/Cargo.toml index a939fd7f951..e8581d5f044 100644 --- a/internal/renderers/femtovg/Cargo.toml +++ b/internal/renderers/femtovg/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "i-slint-renderer-femtovg" diff --git a/internal/renderers/femtovg/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/internal/renderers/femtovg/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..f6a4790a3fd --- /dev/null +++ b/internal/renderers/femtovg/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/internal/renderers/femtovg/README.md b/internal/renderers/femtovg/README.md index 1a440a8c8d7..3b261934e4a 100644 --- a/internal/renderers/femtovg/README.md +++ b/internal/renderers/femtovg/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 **NOTE**: This library is an **internal** crate of the [Slint project](https://slint.dev). This crate should **not be used directly** by applications using Slint. diff --git a/internal/renderers/femtovg/fonts.rs b/internal/renderers/femtovg/fonts.rs index 8f0b41cc050..acbbd736d1f 100644 --- a/internal/renderers/femtovg/fonts.rs +++ b/internal/renderers/femtovg/fonts.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cspell:ignore Noto fontconfig diff --git a/internal/renderers/femtovg/images.rs b/internal/renderers/femtovg/images.rs index a51dcfb6536..939369fa5d1 100644 --- a/internal/renderers/femtovg/images.rs +++ b/internal/renderers/femtovg/images.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::collections::HashMap; use std::rc::Rc; diff --git a/internal/renderers/femtovg/itemrenderer.rs b/internal/renderers/femtovg/itemrenderer.rs index edac398b33a..fcb2f6d3fc9 100644 --- a/internal/renderers/femtovg/itemrenderer.rs +++ b/internal/renderers/femtovg/itemrenderer.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::cell::RefCell; use std::pin::Pin; diff --git a/internal/renderers/femtovg/lib.rs b/internal/renderers/femtovg/lib.rs index d4a9dab1c13..1239dd0c930 100644 --- a/internal/renderers/femtovg/lib.rs +++ b/internal/renderers/femtovg/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![doc = include_str!("README.md")] #![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")] diff --git a/internal/renderers/skia/Cargo.toml b/internal/renderers/skia/Cargo.toml index fb03eac4ad1..f2eb895d4b1 100644 --- a/internal/renderers/skia/Cargo.toml +++ b/internal/renderers/skia/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "i-slint-renderer-skia" diff --git a/internal/renderers/skia/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/internal/renderers/skia/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..f6a4790a3fd --- /dev/null +++ b/internal/renderers/skia/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/internal/renderers/skia/README.md b/internal/renderers/skia/README.md index 1a440a8c8d7..3b261934e4a 100644 --- a/internal/renderers/skia/README.md +++ b/internal/renderers/skia/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 **NOTE**: This library is an **internal** crate of the [Slint project](https://slint.dev). This crate should **not be used directly** by applications using Slint. diff --git a/internal/renderers/skia/build.rs b/internal/renderers/skia/build.rs index d048e0eca56..b74f88a7d50 100644 --- a/internal/renderers/skia/build.rs +++ b/internal/renderers/skia/build.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use cfg_aliases::cfg_aliases; diff --git a/internal/renderers/skia/cached_image.rs b/internal/renderers/skia/cached_image.rs index 1a4c1e66a83..fa271cb263b 100644 --- a/internal/renderers/skia/cached_image.rs +++ b/internal/renderers/skia/cached_image.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::PhysicalSize; #[cfg(skia_backend_opengl)] diff --git a/internal/renderers/skia/d3d_surface.rs b/internal/renderers/skia/d3d_surface.rs index 350a8cd60fc..8060ba9cb4e 100644 --- a/internal/renderers/skia/d3d_surface.rs +++ b/internal/renderers/skia/d3d_surface.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_core::api::PhysicalSize as PhysicalWindowSize; use i_slint_core::platform::PlatformError; diff --git a/internal/renderers/skia/itemrenderer.rs b/internal/renderers/skia/itemrenderer.rs index 8fdac492ff7..83217a902d3 100644 --- a/internal/renderers/skia/itemrenderer.rs +++ b/internal/renderers/skia/itemrenderer.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore rrect diff --git a/internal/renderers/skia/lib.rs b/internal/renderers/skia/lib.rs index 92aa28d2840..89546556288 100644 --- a/internal/renderers/skia/lib.rs +++ b/internal/renderers/skia/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![doc = include_str!("README.md")] #![doc(html_logo_url = "https://slint.dev/logo/slint-logo-square-light.svg")] diff --git a/internal/renderers/skia/metal_surface.rs b/internal/renderers/skia/metal_surface.rs index f8355677760..662b74c59f7 100644 --- a/internal/renderers/skia/metal_surface.rs +++ b/internal/renderers/skia/metal_surface.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use cocoa::{appkit::NSView, base::id as cocoa_id}; use core_graphics_types::geometry::CGSize; diff --git a/internal/renderers/skia/opengl_surface.rs b/internal/renderers/skia/opengl_surface.rs index 2439e549583..5ac76557b5b 100644 --- a/internal/renderers/skia/opengl_surface.rs +++ b/internal/renderers/skia/opengl_surface.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::{cell::RefCell, num::NonZeroU32}; diff --git a/internal/renderers/skia/software_surface.rs b/internal/renderers/skia/software_surface.rs index 0a0a700eacd..18b45d265b9 100644 --- a/internal/renderers/skia/software_surface.rs +++ b/internal/renderers/skia/software_surface.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_core::api::PhysicalSize as PhysicalWindowSize; diff --git a/internal/renderers/skia/textlayout.rs b/internal/renderers/skia/textlayout.rs index da7921183d8..8a671434a3d 100644 --- a/internal/renderers/skia/textlayout.rs +++ b/internal/renderers/skia/textlayout.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::cell::RefCell; use std::collections::HashMap; diff --git a/internal/renderers/skia/vulkan_surface.rs b/internal/renderers/skia/vulkan_surface.rs index dbf43a61760..af656c28ea6 100644 --- a/internal/renderers/skia/vulkan_surface.rs +++ b/internal/renderers/skia/vulkan_surface.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::cell::{Cell, RefCell}; use std::sync::Arc; diff --git a/logo/README.md b/logo/README.md index ae65dd55abb..e14f28f30c1 100644 --- a/logo/README.md +++ b/logo/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Branding Guidelines @@ -32,7 +36,11 @@ It is (manually) copied into the website under . ![Slint logo small light](./slint-logo-small-light.svg#gh-light-mode-only)![Slint logo small dark](./slint-logo-small-dark.svg#gh-dark-mode-only) +<<<<<<< HEAD +* Use the #MadeWithSlint logo for attributions to Slint (e.g. when using Slint under the [Royalty-Free License](../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md)). +======= * Use the #MadeWithSlint logo for attributions to Slint (e.g. when using Slint under the [Royalty-Free License](../LICENSES/LicenseRef-Slint-Royalty-free.md)). +>>>>>>> 303633443647db52f33842b9707e25e3067db232 ![#MadeWithSlint logo light](./MadeWithSlint-logo-light.svg#gh-light-mode-only)![#MadeWithSlint logo dark](./MadeWithSlint-logo-dark.svg#gh-dark-mode-only) diff --git a/scripts/prepare_binary_package.sh b/scripts/prepare_binary_package.sh index 3675fca083e..534ed8539f4 100755 --- a/scripts/prepare_binary_package.sh +++ b/scripts/prepare_binary_package.sh @@ -1,6 +1,10 @@ #!/bin/bash -e # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 if [ $# -lt 1 ]; then echo "usage: $0 path/to/target/binary_package" diff --git a/scripts/prepare_vscode_nightly.sh b/scripts/prepare_vscode_nightly.sh index 7685de80442..fc54570c08d 100755 --- a/scripts/prepare_vscode_nightly.sh +++ b/scripts/prepare_vscode_nightly.sh @@ -1,6 +1,10 @@ #!/bin/bash -e # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 cd `dirname $0`/../editors/vscode diff --git a/scripts/publish.sh b/scripts/publish.sh index 0cb308c5286..d6ee137f818 100755 --- a/scripts/publish.sh +++ b/scripts/publish.sh @@ -1,6 +1,10 @@ #!/bin/bash -e # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 cargo publish --manifest-path internal/common/Cargo.toml cargo publish --manifest-path internal/core-macros/Cargo.toml diff --git a/tests/cases/absolute_coords.slint b/tests/cases/absolute_coords.slint index eb8de206071..50062c6137c 100644 --- a/tests/cases/absolute_coords.slint +++ b/tests/cases/absolute_coords.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component Item { callback pointer-event <=> touch.pointer-event; diff --git a/tests/cases/accessibility/materialized.slint b/tests/cases/accessibility/materialized.slint index f1dffda9f96..cf7659a4dfc 100644 --- a/tests/cases/accessibility/materialized.slint +++ b/tests/cases/accessibility/materialized.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test the propagation of maximum and minimum size through nested grid layouts diff --git a/tests/cases/bindings/animated_default_geometry.slint b/tests/cases/bindings/animated_default_geometry.slint index c034eae96cb..ac9275e8134 100644 --- a/tests/cases/bindings/animated_default_geometry.slint +++ b/tests/cases/bindings/animated_default_geometry.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { diff --git a/tests/cases/bindings/change_sub_property.slint b/tests/cases/bindings/change_sub_property.slint index e7a305c4f21..e975f4e6904 100644 --- a/tests/cases/bindings/change_sub_property.slint +++ b/tests/cases/bindings/change_sub_property.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 SubElem := Rectangle { property value: sub.value; diff --git a/tests/cases/bindings/change_sub_property2.slint b/tests/cases/bindings/change_sub_property2.slint index 48af6c47e2f..90fa0efa2e8 100644 --- a/tests/cases/bindings/change_sub_property2.slint +++ b/tests/cases/bindings/change_sub_property2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 SubElem := Rectangle { property value: 55; diff --git a/tests/cases/bindings/change_sub_property_indirection.slint b/tests/cases/bindings/change_sub_property_indirection.slint index 7472d1e4548..577305dae73 100644 --- a/tests/cases/bindings/change_sub_property_indirection.slint +++ b/tests/cases/bindings/change_sub_property_indirection.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // hello, hello2 and alias are aliases SubElem := Rectangle { diff --git a/tests/cases/bindings/change_sub_property_indirection_issue2185.slint b/tests/cases/bindings/change_sub_property_indirection_issue2185.slint index b42ded056f9..3726d8cfb68 100644 --- a/tests/cases/bindings/change_sub_property_indirection_issue2185.slint +++ b/tests/cases/bindings/change_sub_property_indirection_issue2185.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component Buggy { in-out property magic: "Nope"; diff --git a/tests/cases/bindings/issue_1026_opacity_alias.slint b/tests/cases/bindings/issue_1026_opacity_alias.slint index 9e6b887c345..51d73d2316f 100644 --- a/tests/cases/bindings/issue_1026_opacity_alias.slint +++ b/tests/cases/bindings/issue_1026_opacity_alias.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 RoundedIcon := Rectangle { diff --git a/tests/cases/bindings/issue_345_opacity_animation.slint b/tests/cases/bindings/issue_345_opacity_animation.slint index ef98611feb0..844ff6ab19c 100644 --- a/tests/cases/bindings/issue_345_opacity_animation.slint +++ b/tests/cases/bindings/issue_345_opacity_animation.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Sub := Rectangle { property cond; diff --git a/tests/cases/bindings/issue_385_default_geom.slint b/tests/cases/bindings/issue_385_default_geom.slint index 6cc25fb054d..0fcdab695cf 100644 --- a/tests/cases/bindings/issue_385_default_geom.slint +++ b/tests/cases/bindings/issue_385_default_geom.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { diff --git a/tests/cases/bindings/multiple_two_way.slint b/tests/cases/bindings/multiple_two_way.slint index 4f6ac10c753..2345bac0abd 100644 --- a/tests/cases/bindings/multiple_two_way.slint +++ b/tests/cases/bindings/multiple_two_way.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 O := Text { property val; diff --git a/tests/cases/bindings/override.slint b/tests/cases/bindings/override.slint index 22b62e4c4d7..d68c5c51aa0 100644 --- a/tests/cases/bindings/override.slint +++ b/tests/cases/bindings/override.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Compo := Text { property prop_a: 10; diff --git a/tests/cases/bindings/two_way_binding.slint b/tests/cases/bindings/two_way_binding.slint index 93427c7937f..82b8785f717 100644 --- a/tests/cases/bindings/two_way_binding.slint +++ b/tests/cases/bindings/two_way_binding.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 OtherComp := Rectangle { property t <=> text.text; diff --git a/tests/cases/bindings/two_way_binding2.slint b/tests/cases/bindings/two_way_binding2.slint index 6ebafba9401..bddb3580e81 100644 --- a/tests/cases/bindings/two_way_binding2.slint +++ b/tests/cases/bindings/two_way_binding2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 OtherComp := Rectangle { property t <=> text.text; diff --git a/tests/cases/bindings/two_way_binding_animation.slint b/tests/cases/bindings/two_way_binding_animation.slint index c1fa4f0e378..65f2f7de4b1 100644 --- a/tests/cases/bindings/two_way_binding_animation.slint +++ b/tests/cases/bindings/two_way_binding_animation.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property xx : 1000; diff --git a/tests/cases/bindings/two_way_binding_extra.slint b/tests/cases/bindings/two_way_binding_extra.slint index c78475792c6..5b5131e1843 100644 --- a/tests/cases/bindings/two_way_binding_extra.slint +++ b/tests/cases/bindings/two_way_binding_extra.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 diff --git a/tests/cases/bindings/two_way_bug.slint b/tests/cases/bindings/two_way_bug.slint index 3f64ef0ab27..39f1fd96d02 100644 --- a/tests/cases/bindings/two_way_bug.slint +++ b/tests/cases/bindings/two_way_bug.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // There used to be a bug in the deduplicate_property_read pass that would mess up aliases diff --git a/tests/cases/bindings/two_way_deep.slint b/tests/cases/bindings/two_way_deep.slint index 0097378b939..059a76eff2a 100644 --- a/tests/cases/bindings/two_way_deep.slint +++ b/tests/cases/bindings/two_way_deep.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 LineEdit := Rectangle { property text <=> ti.text; diff --git a/tests/cases/bindings/two_way_model.slint b/tests/cases/bindings/two_way_model.slint index 11c72e4adfc..ca11096c987 100644 --- a/tests/cases/bindings/two_way_model.slint +++ b/tests/cases/bindings/two_way_model.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Regression test for a bug in which an alias to a model property was not // properly set because it was thought as constant diff --git a/tests/cases/bindings/two_way_priority.slint b/tests/cases/bindings/two_way_priority.slint index dce804e4c06..6d47bce660b 100644 --- a/tests/cases/bindings/two_way_priority.slint +++ b/tests/cases/bindings/two_way_priority.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 OpacityTwoWay := Rectangle { property sub_opacity <=> rect.opacity; diff --git a/tests/cases/bindings/two_way_priority_default.slint b/tests/cases/bindings/two_way_priority_default.slint index 839b7fb6a9c..8dd3316f14d 100644 --- a/tests/cases/bindings/two_way_priority_default.slint +++ b/tests/cases/bindings/two_way_priority_default.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // The visible and enabled property are set by default by Slint to true. // But when overridden by an alias, the overridden value should take precedence. diff --git a/tests/cases/bindings/two_way_simple.slint b/tests/cases/bindings/two_way_simple.slint index 3c6ac1dc00a..73cdf9c4a6a 100644 --- a/tests/cases/bindings/two_way_simple.slint +++ b/tests/cases/bindings/two_way_simple.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property extra_background <=> background; diff --git a/tests/cases/callbacks/callback_alias.slint b/tests/cases/callbacks/callback_alias.slint index 13c91f4b0ad..c83a03fe390 100644 --- a/tests/cases/callbacks/callback_alias.slint +++ b/tests/cases/callbacks/callback_alias.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Foo := Rectangle { pure callback hallo_alias <=> xxx.hallo; diff --git a/tests/cases/callbacks/callback_name_conflicts.slint b/tests/cases/callbacks/callback_name_conflicts.slint index ec76b07cb5a..916bc993806 100644 --- a/tests/cases/callbacks/callback_name_conflicts.slint +++ b/tests/cases/callbacks/callback_name_conflicts.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { width: 100phx; diff --git a/tests/cases/callbacks/functions.slint b/tests/cases/callbacks/functions.slint index 627ed17dd22..f60163743ad 100644 --- a/tests/cases/callbacks/functions.slint +++ b/tests/cases/callbacks/functions.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 global G := { property hello: "hello"; diff --git a/tests/cases/callbacks/handler.slint b/tests/cases/callbacks/handler.slint index a55eefd7fa8..e669b6ad1b0 100644 --- a/tests/cases/callbacks/handler.slint +++ b/tests/cases/callbacks/handler.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { callback test_callback; diff --git a/tests/cases/callbacks/handler_with_arg.slint b/tests/cases/callbacks/handler_with_arg.slint index 0a56d2f7947..29ea2216155 100644 --- a/tests/cases/callbacks/handler_with_arg.slint +++ b/tests/cases/callbacks/handler_with_arg.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { callback test_callback(int); diff --git a/tests/cases/callbacks/init.slint b/tests/cases/callbacks/init.slint index 4034e6c9838..4756cda3e86 100644 --- a/tests/cases/callbacks/init.slint +++ b/tests/cases/callbacks/init.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Verify that the init callback is invoked in the correct order diff --git a/tests/cases/callbacks/init_access_base_compo.slint b/tests/cases/callbacks/init_access_base_compo.slint index e869dc6fc1d..219ae0da98d 100644 --- a/tests/cases/callbacks/init_access_base_compo.slint +++ b/tests/cases/callbacks/init_access_base_compo.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Verify that properties in the base type can be accessed from init diff --git a/tests/cases/callbacks/init_layout.slint b/tests/cases/callbacks/init_layout.slint index 77132291bd7..68d90bf6e12 100644 --- a/tests/cases/callbacks/init_layout.slint +++ b/tests/cases/callbacks/init_layout.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Verify that the init callback is invoked in the correct order diff --git a/tests/cases/callbacks/init_popup.slint b/tests/cases/callbacks/init_popup.slint index 8ae12e07b36..ccf9f5d0678 100644 --- a/tests/cases/callbacks/init_popup.slint +++ b/tests/cases/callbacks/init_popup.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Verify that the init callback is invoked in the correct order diff --git a/tests/cases/callbacks/return_value.slint b/tests/cases/callbacks/return_value.slint index a92a7013fae..8de79df7cdb 100644 --- a/tests/cases/callbacks/return_value.slint +++ b/tests/cases/callbacks/return_value.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { pure callback test_func(int) -> int; diff --git a/tests/cases/children/children_placeholder.slint b/tests/cases/children/children_placeholder.slint index e263e57c660..3789d83a59e 100644 --- a/tests/cases/children/children_placeholder.slint +++ b/tests/cases/children/children_placeholder.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Container := Rectangle { GridLayout { diff --git a/tests/cases/children/children_placeholder_two_levels.slint b/tests/cases/children/children_placeholder_two_levels.slint index da6e379c8d4..59f12189011 100644 --- a/tests/cases/children/children_placeholder_two_levels.slint +++ b/tests/cases/children/children_placeholder_two_levels.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Container := Rectangle { GridLayout { diff --git a/tests/cases/children/zorder.slint b/tests/cases/children/zorder.slint index 7c9bf8adb10..cd57134f502 100644 --- a/tests/cases/children/zorder.slint +++ b/tests/cases/children/zorder.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { width: 100phx; diff --git a/tests/cases/conditional/cast.slint b/tests/cases/conditional/cast.slint index 014858bda45..1e76e0e99e7 100644 --- a/tests/cases/conditional/cast.slint +++ b/tests/cases/conditional/cast.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property condition; diff --git a/tests/cases/conditional/expr.slint b/tests/cases/conditional/expr.slint index 5508b95e370..e4f5a4b04b5 100644 --- a/tests/cases/conditional/expr.slint +++ b/tests/cases/conditional/expr.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property condition; diff --git a/tests/cases/conditional/stm.slint b/tests/cases/conditional/stm.slint index 80bcbde94e2..969a6c06601 100644 --- a/tests/cases/conditional/stm.slint +++ b/tests/cases/conditional/stm.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property value; diff --git a/tests/cases/conditional/stm2.slint b/tests/cases/conditional/stm2.slint index 5675583c2cd..f82318a5d0e 100644 --- a/tests/cases/conditional/stm2.slint +++ b/tests/cases/conditional/stm2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property value; diff --git a/tests/cases/crashes/access_ellided_prop.slint b/tests/cases/crashes/access_ellided_prop.slint index f7e1055c11a..b9f7a2aef4d 100644 --- a/tests/cases/crashes/access_ellided_prop.slint +++ b/tests/cases/crashes/access_ellided_prop.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // issue #177 diff --git a/tests/cases/crashes/access_moved_propdecl.slint b/tests/cases/crashes/access_moved_propdecl.slint index c3179c145f1..ca439d70ab3 100644 --- a/tests/cases/crashes/access_moved_propdecl.slint +++ b/tests/cases/crashes/access_moved_propdecl.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test case that accesses a declared property ("property pressed") from within a binding for "text". // The property will be moved to the root as part of the move declarations pass and therefore the named reference diff --git a/tests/cases/crashes/alias_in_if.slint b/tests/cases/crashes/alias_in_if.slint index d192d994b62..165520ad233 100644 --- a/tests/cases/crashes/alias_in_if.slint +++ b/tests/cases/crashes/alias_in_if.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 App := Rectangle { property hello: "ooo"; diff --git a/tests/cases/crashes/empty_listview.slint b/tests/cases/crashes/empty_listview.slint index d932e36b764..6b0c750b366 100644 --- a/tests/cases/crashes/empty_listview.slint +++ b/tests/cases/crashes/empty_listview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ListView } from "std-widgets.slint"; diff --git a/tests/cases/crashes/issue1113_popup_in_repeater.slint b/tests/cases/crashes/issue1113_popup_in_repeater.slint index 9d3e072592e..100d7c712c3 100644 --- a/tests/cases/crashes/issue1113_popup_in_repeater.slint +++ b/tests/cases/crashes/issue1113_popup_in_repeater.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 App := Window { for menu-item in [{children: ["hello"]}] : VerticalLayout { diff --git a/tests/cases/crashes/issue1267_opacity_in_layout.slint b/tests/cases/crashes/issue1267_opacity_in_layout.slint index fd1bec87f72..7119b0b9042 100644 --- a/tests/cases/crashes/issue1267_opacity_in_layout.slint +++ b/tests/cases/crashes/issue1267_opacity_in_layout.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 MainWindow := Window { VerticalLayout { diff --git a/tests/cases/crashes/issue1271_set_in_if.slint b/tests/cases/crashes/issue1271_set_in_if.slint index e29450a4720..83585cc3560 100644 --- a/tests/cases/crashes/issue1271_set_in_if.slint +++ b/tests/cases/crashes/issue1271_set_in_if.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { property t_: 8; diff --git a/tests/cases/crashes/issue1327_inlined_state_property.slint b/tests/cases/crashes/issue1327_inlined_state_property.slint index be0b09d67aa..e8199f4e844 100644 --- a/tests/cases/crashes/issue1327_inlined_state_property.slint +++ b/tests/cases/crashes/issue1327_inlined_state_property.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // based on https://github.com/slint-ui/slint/issues/1327#issuecomment-1151244049 diff --git a/tests/cases/crashes/issue1659_combobox_in_tab.slint b/tests/cases/crashes/issue1659_combobox_in_tab.slint index 03600eaaaee..a45653078ea 100644 --- a/tests/cases/crashes/issue1659_combobox_in_tab.slint +++ b/tests/cases/crashes/issue1659_combobox_in_tab.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { TabWidget } from "std-widgets.slint"; diff --git a/tests/cases/crashes/issue173_uninitialized_globals.slint b/tests/cases/crashes/issue173_uninitialized_globals.slint index f7818d549fa..a4319c00241 100644 --- a/tests/cases/crashes/issue173_uninitialized_globals.slint +++ b/tests/cases/crashes/issue173_uninitialized_globals.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // This is a test for a crash withthe interpreter when evaluating properties diff --git a/tests/cases/crashes/issue3589_layout_click_deletes_item.slint b/tests/cases/crashes/issue3589_layout_click_deletes_item.slint index cf2de8c8f14..62057dd0bc5 100644 --- a/tests/cases/crashes/issue3589_layout_click_deletes_item.slint +++ b/tests/cases/crashes/issue3589_layout_click_deletes_item.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase inherits Rectangle { diff --git a/tests/cases/crashes/issue_1009_const_alias.slint b/tests/cases/crashes/issue_1009_const_alias.slint index 50d28db4bcb..a5b62609cdb 100644 --- a/tests/cases/crashes/issue_1009_const_alias.slint +++ b/tests/cases/crashes/issue_1009_const_alias.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Button := Text { } diff --git a/tests/cases/crashes/issue_1233_listview_const_shadow.slint b/tests/cases/crashes/issue_1233_listview_const_shadow.slint index 9814579c4e6..b9334cbe10c 100644 --- a/tests/cases/crashes/issue_1233_listview_const_shadow.slint +++ b/tests/cases/crashes/issue_1233_listview_const_shadow.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ListView } from "std-widgets.slint"; diff --git a/tests/cases/crashes/issue_2274_const_state_crash.slint b/tests/cases/crashes/issue_2274_const_state_crash.slint index 6f1dc46a051..d7ecb44f909 100644 --- a/tests/cases/crashes/issue_2274_const_state_crash.slint +++ b/tests/cases/crashes/issue_2274_const_state_crash.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase { diff --git a/tests/cases/crashes/issue_4002_width_alias.slint b/tests/cases/crashes/issue_4002_width_alias.slint index a5c3673aeb0..ecc44b9fc14 100644 --- a/tests/cases/crashes/issue_4002_width_alias.slint +++ b/tests/cases/crashes/issue_4002_width_alias.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 global ResizeState { in property handle-size: 10px; diff --git a/tests/cases/crashes/issue_422_enclosing_component.slint b/tests/cases/crashes/issue_422_enclosing_component.slint index d379a1dbce0..7a42ce88fd8 100644 --- a/tests/cases/crashes/issue_422_enclosing_component.slint +++ b/tests/cases/crashes/issue_422_enclosing_component.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // issue #422 diff --git a/tests/cases/crashes/issue_983_listview_const_width.slint b/tests/cases/crashes/issue_983_listview_const_width.slint index 87f598d12ed..d27a3169e8a 100644 --- a/tests/cases/crashes/issue_983_listview_const_width.slint +++ b/tests/cases/crashes/issue_983_listview_const_width.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ListView } from "std-widgets.slint"; diff --git a/tests/cases/crashes/layout_deleted_item.slint b/tests/cases/crashes/layout_deleted_item.slint index 57dce09d7d7..899d13cd0bc 100644 --- a/tests/cases/crashes/layout_deleted_item.slint +++ b/tests/cases/crashes/layout_deleted_item.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // issue #177 diff --git a/tests/cases/crashes/layout_if_in_component.slint b/tests/cases/crashes/layout_if_in_component.slint index 70df8b05fb2..bf0d46a3eac 100644 --- a/tests/cases/crashes/layout_if_in_component.slint +++ b/tests/cases/crashes/layout_if_in_component.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Btn := Rectangle { diff --git a/tests/cases/crashes/link_two_way_geometry_if.slint b/tests/cases/crashes/link_two_way_geometry_if.slint index 211bdb9c130..1a6a5503038 100644 --- a/tests/cases/crashes/link_two_way_geometry_if.slint +++ b/tests/cases/crashes/link_two_way_geometry_if.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase { tl_layout := HorizontalLayout { diff --git a/tests/cases/crashes/optimized_item_shadow.slint b/tests/cases/crashes/optimized_item_shadow.slint index 97b0d62c315..9c4b5035e51 100644 --- a/tests/cases/crashes/optimized_item_shadow.slint +++ b/tests/cases/crashes/optimized_item_shadow.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export D := Rectangle { for xy in 1 : Rectangle { diff --git a/tests/cases/crashes/optimized_popup_parent.slint b/tests/cases/crashes/optimized_popup_parent.slint index 8e5f8caa761..25ce73f7f33 100644 --- a/tests/cases/crashes/optimized_popup_parent.slint +++ b/tests/cases/crashes/optimized_popup_parent.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Foo := Rectangle { diff --git a/tests/cases/crashes/shadow_fixed_width.slint b/tests/cases/crashes/shadow_fixed_width.slint index 4e8c40657f1..5f023726b25 100644 --- a/tests/cases/crashes/shadow_fixed_width.slint +++ b/tests/cases/crashes/shadow_fixed_width.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export D := Window { VerticalLayout { diff --git a/tests/cases/crashes/subsubcomponent.slint b/tests/cases/crashes/subsubcomponent.slint index 90289ab351f..21c43badb43 100644 --- a/tests/cases/crashes/subsubcomponent.slint +++ b/tests/cases/crashes/subsubcomponent.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 SubSubCompo := Rectangle { } SubCompo := SubSubCompo {} diff --git a/tests/cases/crashes/subsubcomponent2.slint b/tests/cases/crashes/subsubcomponent2.slint index cf06a2de086..999b096b8bc 100644 --- a/tests/cases/crashes/subsubcomponent2.slint +++ b/tests/cases/crashes/subsubcomponent2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test for issue #781 diff --git a/tests/cases/crashes/unused_callback_alias.slint b/tests/cases/crashes/unused_callback_alias.slint index eb8d2865f0b..aef8bc25425 100644 --- a/tests/cases/crashes/unused_callback_alias.slint +++ b/tests/cases/crashes/unused_callback_alias.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component TextInner inherits Text { callback panic(); diff --git a/tests/cases/elements/component_container.slint b/tests/cases/elements/component_container.slint index 867fa7384a4..7f83896fe46 100644 --- a/tests/cases/elements/component_container.slint +++ b/tests/cases/elements/component_container.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // FIXME: Skip embedding test on C++ and NodeJS since ComponentFactory is not // implemented there! diff --git a/tests/cases/elements/component_container_component.slint b/tests/cases/elements/component_container_component.slint index 81f5515f981..bcfb5b3ad91 100644 --- a/tests/cases/elements/component_container_component.slint +++ b/tests/cases/elements/component_container_component.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // FIXME: Skip embedding test on C++ and NodeJS since ComponentFactory is not // implemented there! diff --git a/tests/cases/elements/component_container_init.slint b/tests/cases/elements/component_container_init.slint index f94d8f516ea..d05dbe3e245 100644 --- a/tests/cases/elements/component_container_init.slint +++ b/tests/cases/elements/component_container_init.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // FIXME: Skip embedding test on C++ and NodeJS since ComponentFactory is not implemented there! //ignore: cpp,js diff --git a/tests/cases/elements/component_container_size.slint b/tests/cases/elements/component_container_size.slint index 344424cad3e..76b26f55147 100644 --- a/tests/cases/elements/component_container_size.slint +++ b/tests/cases/elements/component_container_size.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // FIXME: Skip embedding test on C++ and NodeJS since ComponentFactory is not // implemented there! diff --git a/tests/cases/elements/dialog.slint b/tests/cases/elements/dialog.slint index c187069d6d6..bbf2134c52b 100644 --- a/tests/cases/elements/dialog.slint +++ b/tests/cases/elements/dialog.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StandardButton, Button, GridBox } from "std-widgets.slint"; diff --git a/tests/cases/elements/element_ref_on_root_compo.slint b/tests/cases/elements/element_ref_on_root_compo.slint index be3398efa38..4e4b97712ba 100644 --- a/tests/cases/elements/element_ref_on_root_compo.slint +++ b/tests/cases/elements/element_ref_on_root_compo.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Allow for accessing built-in functions on root elements even with an injected window item diff --git a/tests/cases/elements/flickable.slint b/tests/cases/elements/flickable.slint index e78fc7b56ec..77783cdeb07 100644 --- a/tests/cases/elements/flickable.slint +++ b/tests/cases/elements/flickable.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { diff --git a/tests/cases/elements/flickable2.slint b/tests/cases/elements/flickable2.slint index 5f564e198a2..359f104a0cc 100644 --- a/tests/cases/elements/flickable2.slint +++ b/tests/cases/elements/flickable2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 InheritFlickable := Flickable {} diff --git a/tests/cases/elements/flickable3.slint b/tests/cases/elements/flickable3.slint index 4445974c8db..d0400cc731e 100644 --- a/tests/cases/elements/flickable3.slint +++ b/tests/cases/elements/flickable3.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { diff --git a/tests/cases/elements/flickable_in_flickable.slint b/tests/cases/elements/flickable_in_flickable.slint index 04c36cf5195..4cce396ae75 100644 --- a/tests/cases/elements/flickable_in_flickable.slint +++ b/tests/cases/elements/flickable_in_flickable.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { width: 500px; diff --git a/tests/cases/elements/image.slint b/tests/cases/elements/image.slint index 3c9f3ae16aa..b0c269ed5dc 100644 --- a/tests/cases/elements/image.slint +++ b/tests/cases/elements/image.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //include_path: ../../../examples/printerdemo/ui/images/ diff --git a/tests/cases/elements/image_geometry.slint b/tests/cases/elements/image_geometry.slint index c891dd64cf3..c7c5cd0a528 100644 --- a/tests/cases/elements/image_geometry.slint +++ b/tests/cases/elements/image_geometry.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //include_path: ../../../examples/printerdemo/ui/images/ diff --git a/tests/cases/elements/listview.slint b/tests/cases/elements/listview.slint index 5ecb23b552e..0de45446ba1 100644 --- a/tests/cases/elements/listview.slint +++ b/tests/cases/elements/listview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ListView } from "std-widgets.slint"; diff --git a/tests/cases/elements/listview_click_open.slint b/tests/cases/elements/listview_click_open.slint index 21837d185d2..a6d30cc7b00 100644 --- a/tests/cases/elements/listview_click_open.slint +++ b/tests/cases/elements/listview_click_open.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ListView } from "std-widgets.slint"; diff --git a/tests/cases/elements/path.slint b/tests/cases/elements/path.slint index 6404d2aea60..71653b148e9 100644 --- a/tests/cases/elements/path.slint +++ b/tests/cases/elements/path.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Path { property my_x: 100; diff --git a/tests/cases/elements/path_fit.slint b/tests/cases/elements/path_fit.slint index d9fa9a74726..a464eaf0775 100644 --- a/tests/cases/elements/path_fit.slint +++ b/tests/cases/elements/path_fit.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { diff --git a/tests/cases/elements/popupwindow.slint b/tests/cases/elements/popupwindow.slint index 345c6a78c13..78bb5dba166 100644 --- a/tests/cases/elements/popupwindow.slint +++ b/tests/cases/elements/popupwindow.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // The presence of this component shouldn't break anything component Window {} diff --git a/tests/cases/elements/popupwindow_close.slint b/tests/cases/elements/popupwindow_close.slint index e851f256bcc..6aa05551210 100644 --- a/tests/cases/elements/popupwindow_close.slint +++ b/tests/cases/elements/popupwindow_close.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase { width: 300px; diff --git a/tests/cases/elements/popupwindow_context.slint b/tests/cases/elements/popupwindow_context.slint index 66ae7e2ee35..5f7faccc429 100644 --- a/tests/cases/elements/popupwindow_context.slint +++ b/tests/cases/elements/popupwindow_context.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Palette } from "std-widgets.slint"; diff --git a/tests/cases/elements/popupwindow_cursor.slint b/tests/cases/elements/popupwindow_cursor.slint index 1da896e22a4..efba805364f 100644 --- a/tests/cases/elements/popupwindow_cursor.slint +++ b/tests/cases/elements/popupwindow_cursor.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase { width: 300px; diff --git a/tests/cases/elements/tabwidget.slint b/tests/cases/elements/tabwidget.slint index 9e1c630027a..8913824deeb 100644 --- a/tests/cases/elements/tabwidget.slint +++ b/tests/cases/elements/tabwidget.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { TabWidget } from "std-widgets.slint"; diff --git a/tests/cases/elements/togglebutton.slint b/tests/cases/elements/togglebutton.slint index 8537197be54..4d2f21db7c4 100644 --- a/tests/cases/elements/togglebutton.slint +++ b/tests/cases/elements/togglebutton.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Button } from "std-widgets.slint"; diff --git a/tests/cases/elements/toucharea.slint b/tests/cases/elements/toucharea.slint index 62bd4c2f88d..520bcc4aeeb 100644 --- a/tests/cases/elements/toucharea.slint +++ b/tests/cases/elements/toucharea.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase { in-out property touch1; diff --git a/tests/cases/elements/toucharea_doubleclick.slint b/tests/cases/elements/toucharea_doubleclick.slint index 16296b98384..8cc55213f68 100644 --- a/tests/cases/elements/toucharea_doubleclick.slint +++ b/tests/cases/elements/toucharea_doubleclick.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase { in-out property touch1; diff --git a/tests/cases/examples/box_shadow_use.slint b/tests/cases/examples/box_shadow_use.slint index bccf4379017..cc9538ffb29 100644 --- a/tests/cases/examples/box_shadow_use.slint +++ b/tests/cases/examples/box_shadow_use.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test to show the internal `BoxShadow` element. This can be used for manual // visual verification and it also serves as a test to ensure that such generated diff --git a/tests/cases/examples/color.slint b/tests/cases/examples/color.slint index 8d3f513ff56..6ff1f5dbfac 100644 --- a/tests/cases/examples/color.slint +++ b/tests/cases/examples/color.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Win := Window { property base: #00007F; diff --git a/tests/cases/examples/colored_image.slint b/tests/cases/examples/colored_image.slint index 53fb405d282..340c34399ff 100644 --- a/tests/cases/examples/colored_image.slint +++ b/tests/cases/examples/colored_image.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Win := Window { GridLayout { diff --git a/tests/cases/examples/hello.slint b/tests/cases/examples/hello.slint index 974d6d9d717..3ffce377577 100644 --- a/tests/cases/examples/hello.slint +++ b/tests/cases/examples/hello.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TwoRectangle := Rectangle { diff --git a/tests/cases/examples/image_fit.slint b/tests/cases/examples/image_fit.slint index d8eeb1ede27..06fc9ee7b1a 100644 --- a/tests/cases/examples/image_fit.slint +++ b/tests/cases/examples/image_fit.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Win := Window { GridLayout { diff --git a/tests/cases/examples/image_rendering.slint b/tests/cases/examples/image_rendering.slint index 07367a0a0b7..e569233735d 100644 --- a/tests/cases/examples/image_rendering.slint +++ b/tests/cases/examples/image_rendering.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export MainWindow := Window { title: "Slint Image Scaling Example"; diff --git a/tests/cases/examples/key_press.slint b/tests/cases/examples/key_press.slint index e26a99986e3..e2ea241924f 100644 --- a/tests/cases/examples/key_press.slint +++ b/tests/cases/examples/key_press.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 W := Window { VerticalLayout { diff --git a/tests/cases/examples/layer.slint b/tests/cases/examples/layer.slint index 216785fa376..8225b5e08f1 100644 --- a/tests/cases/examples/layer.slint +++ b/tests/cases/examples/layer.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Button } from "std-widgets.slint"; diff --git a/tests/cases/examples/opacity.slint b/tests/cases/examples/opacity.slint index 3afed210f22..d20305de57b 100644 --- a/tests/cases/examples/opacity.slint +++ b/tests/cases/examples/opacity.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Comp := Rectangle { Rectangle { diff --git a/tests/cases/examples/path_fill_rule.slint b/tests/cases/examples/path_fill_rule.slint index 6bd88b8e523..76a8f01351d 100644 --- a/tests/cases/examples/path_fill_rule.slint +++ b/tests/cases/examples/path_fill_rule.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 PathFillRule := Window { GridLayout { diff --git a/tests/cases/examples/path_viewbox.slint b/tests/cases/examples/path_viewbox.slint index 42da78c1f9b..24919b3880b 100644 --- a/tests/cases/examples/path_viewbox.slint +++ b/tests/cases/examples/path_viewbox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 RectPath := Path { MoveTo { diff --git a/tests/cases/examples/plusminus.slint b/tests/cases/examples/plusminus.slint index 253f51ffbe2..8fbf2d8e78a 100644 --- a/tests/cases/examples/plusminus.slint +++ b/tests/cases/examples/plusminus.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Btn := Rectangle { property button_text; diff --git a/tests/cases/examples/rectangle_clip.slint b/tests/cases/examples/rectangle_clip.slint index aec51a99a10..f525f84f56f 100644 --- a/tests/cases/examples/rectangle_clip.slint +++ b/tests/cases/examples/rectangle_clip.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // This should render as a rectangle with a black border and // green "fill". diff --git a/tests/cases/examples/rotate.slint b/tests/cases/examples/rotate.slint index bb2e1cc3fd5..3dd9ecc2e76 100644 --- a/tests/cases/examples/rotate.slint +++ b/tests/cases/examples/rotate.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test for manual visual verification of rotation // diff --git a/tests/cases/examples/sample_component.slint b/tests/cases/examples/sample_component.slint index 41fecbbf7ec..0f97759cf41 100644 --- a/tests/cases/examples/sample_component.slint +++ b/tests/cases/examples/sample_component.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export struct MyStruct := { foo: int, diff --git a/tests/cases/examples/window_default_font.slint b/tests/cases/examples/window_default_font.slint index 24a5a2bcddc..9e7ebafce3b 100644 --- a/tests/cases/examples/window_default_font.slint +++ b/tests/cases/examples/window_default_font.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test for manual visual verification of default font properties of Window // diff --git a/tests/cases/exports/cpp_namespace.slint b/tests/cases/exports/cpp_namespace.slint index 222ef12ecf8..00084de1858 100644 --- a/tests/cases/exports/cpp_namespace.slint +++ b/tests/cases/exports/cpp_namespace.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //cpp-namespace: my::ui //ignore: rust,js diff --git a/tests/cases/exports/export_root.slint b/tests/cases/exports/export_root.slint index d37dd259754..ad29edceef1 100644 --- a/tests/cases/exports/export_root.slint +++ b/tests/cases/exports/export_root.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component Ok { in-out property test: true; diff --git a/tests/cases/exports/named_exports.slint b/tests/cases/exports/named_exports.slint index c5ebd7d4a0e..1cc71f8990c 100644 --- a/tests/cases/exports/named_exports.slint +++ b/tests/cases/exports/named_exports.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //include_path: ../../helper_components import { ExportedStruct, ExportEnum } from "export_structs.slint"; diff --git a/tests/cases/expr/abs.slint b/tests/cases/expr/abs.slint index 141dd00acbf..d755cf19a3f 100644 --- a/tests/cases/expr/abs.slint +++ b/tests/cases/expr/abs.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property t1: abs(42.3); diff --git a/tests/cases/expr/acos.slint b/tests/cases/expr/acos.slint index bb89b86f602..ac40b5c8289 100644 --- a/tests/cases/expr/acos.slint +++ b/tests/cases/expr/acos.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property t1: acos(0); diff --git a/tests/cases/expr/animation_tick.slint b/tests/cases/expr/animation_tick.slint index c38bfeb787c..23ff69d344b 100644 --- a/tests/cases/expr/animation_tick.slint +++ b/tests/cases/expr/animation_tick.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property xx: animation-tick() / 1ms; diff --git a/tests/cases/expr/arithmetic.slint b/tests/cases/expr/arithmetic.slint index d59414a0eae..2f742209f01 100644 --- a/tests/cases/expr/arithmetic.slint +++ b/tests/cases/expr/arithmetic.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property a; diff --git a/tests/cases/expr/asin.slint b/tests/cases/expr/asin.slint index e0f94ba2f6b..8b64c1c50f8 100644 --- a/tests/cases/expr/asin.slint +++ b/tests/cases/expr/asin.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property t1: asin(0); diff --git a/tests/cases/expr/atan.slint b/tests/cases/expr/atan.slint index 7e198953144..68027c99cc9 100644 --- a/tests/cases/expr/atan.slint +++ b/tests/cases/expr/atan.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property t1: atan(0); diff --git a/tests/cases/expr/ceil.slint b/tests/cases/expr/ceil.slint index 956f71e5564..17009f27fe3 100644 --- a/tests/cases/expr/ceil.slint +++ b/tests/cases/expr/ceil.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property t1: ceil(42.2); diff --git a/tests/cases/expr/clamp.slint b/tests/cases/expr/clamp.slint index 945ad456d7a..c6d01a22fa9 100644 --- a/tests/cases/expr/clamp.slint +++ b/tests/cases/expr/clamp.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase { in property value: 42.0; diff --git a/tests/cases/expr/comparison.slint b/tests/cases/expr/comparison.slint index 8c730cd7261..6d021d7d551 100644 --- a/tests/cases/expr/comparison.slint +++ b/tests/cases/expr/comparison.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property hello: 44; diff --git a/tests/cases/expr/cos.slint b/tests/cases/expr/cos.slint index 62a2bd695b5..e7880b94f8a 100644 --- a/tests/cases/expr/cos.slint +++ b/tests/cases/expr/cos.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property t1: cos(0); diff --git a/tests/cases/expr/debug.slint b/tests/cases/expr/debug.slint index d0c59a4d0c5..24da3b01e3b 100644 --- a/tests/cases/expr/debug.slint +++ b/tests/cases/expr/debug.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property text: "init"; diff --git a/tests/cases/expr/floor.slint b/tests/cases/expr/floor.slint index 9f04611935f..bb3bb3cc34e 100644 --- a/tests/cases/expr/floor.slint +++ b/tests/cases/expr/floor.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property t1: floor(42.2); diff --git a/tests/cases/expr/log.slint b/tests/cases/expr/log.slint index 5deaa992793..3e30f25a8c2 100644 --- a/tests/cases/expr/log.slint +++ b/tests/cases/expr/log.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property t1: log(4.0, 2); diff --git a/tests/cases/expr/math.slint b/tests/cases/expr/math.slint index ac37eb221c4..f02d4e605f6 100644 --- a/tests/cases/expr/math.slint +++ b/tests/cases/expr/math.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase { diff --git a/tests/cases/expr/minmax.slint b/tests/cases/expr/minmax.slint index 6232de9b334..633966e3f93 100644 --- a/tests/cases/expr/minmax.slint +++ b/tests/cases/expr/minmax.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property a; diff --git a/tests/cases/expr/mod.slint b/tests/cases/expr/mod.slint index d858fa65884..40f23bf3b16 100644 --- a/tests/cases/expr/mod.slint +++ b/tests/cases/expr/mod.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property t1: mod(42, 2); diff --git a/tests/cases/expr/pow.slint b/tests/cases/expr/pow.slint index c1dbc4426cc..f7a6437f637 100644 --- a/tests/cases/expr/pow.slint +++ b/tests/cases/expr/pow.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property t1: pow(4.0, 2); diff --git a/tests/cases/expr/return.slint b/tests/cases/expr/return.slint index c62d210787a..89c5d2da4b0 100644 --- a/tests/cases/expr/return.slint +++ b/tests/cases/expr/return.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property toggle: { return false; } diff --git a/tests/cases/expr/return2.slint b/tests/cases/expr/return2.slint index e70e13cdd57..f69f262d58c 100644 --- a/tests/cases/expr/return2.slint +++ b/tests/cases/expr/return2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export global Foo { in-out property bo: false; diff --git a/tests/cases/expr/round.slint b/tests/cases/expr/round.slint index 607ecaa8a6b..c11290af58b 100644 --- a/tests/cases/expr/round.slint +++ b/tests/cases/expr/round.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property t1: round(42.2); diff --git a/tests/cases/expr/sin.slint b/tests/cases/expr/sin.slint index 9a3666b09c1..49a14c06ce8 100644 --- a/tests/cases/expr/sin.slint +++ b/tests/cases/expr/sin.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property t1: sin(0); diff --git a/tests/cases/expr/sqrt.slint b/tests/cases/expr/sqrt.slint index 1ca36095739..1f4a253f9da 100644 --- a/tests/cases/expr/sqrt.slint +++ b/tests/cases/expr/sqrt.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property t1: sqrt(100.0); diff --git a/tests/cases/expr/string_concatenation.slint b/tests/cases/expr/string_concatenation.slint index e68ae2c3c2f..d4f70f07be8 100644 --- a/tests/cases/expr/string_concatenation.slint +++ b/tests/cases/expr/string_concatenation.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property a:12; diff --git a/tests/cases/expr/string_template.slint b/tests/cases/expr/string_template.slint index 49a22ef1020..075243127fb 100644 --- a/tests/cases/expr/string_template.slint +++ b/tests/cases/expr/string_template.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property a:12; diff --git a/tests/cases/expr/tan.slint b/tests/cases/expr/tan.slint index 85ace52cb00..47c4f3bf54b 100644 --- a/tests/cases/expr/tan.slint +++ b/tests/cases/expr/tan.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property t1: tan(0); diff --git a/tests/cases/expr/tr.slint b/tests/cases/expr/tr.slint index c907aa2ff62..f764990be8a 100644 --- a/tests/cases/expr/tr.slint +++ b/tests/cases/expr/tr.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase { property int_value: 42; diff --git a/tests/cases/expr/trigo.slint b/tests/cases/expr/trigo.slint index d959393d354..99ed8c623af 100644 --- a/tests/cases/expr/trigo.slint +++ b/tests/cases/expr/trigo.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property verify: diff --git a/tests/cases/focus/event_propagation.slint b/tests/cases/focus/event_propagation.slint index 4a935e39f5d..ba527c85f63 100644 --- a/tests/cases/focus/event_propagation.slint +++ b/tests/cases/focus/event_propagation.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { width: 400phx; diff --git a/tests/cases/focus/event_propagation_2.slint b/tests/cases/focus/event_propagation_2.slint index 0e3f0fe4708..86b7923f8a7 100644 --- a/tests/cases/focus/event_propagation_2.slint +++ b/tests/cases/focus/event_propagation_2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { width: 100phx; diff --git a/tests/cases/focus/event_propagation_3.slint b/tests/cases/focus/event_propagation_3.slint index 57569248caf..09eefe285b0 100644 --- a/tests/cases/focus/event_propagation_3.slint +++ b/tests/cases/focus/event_propagation_3.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase inherits Window { width: 100phx; diff --git a/tests/cases/focus/focus_change.slint b/tests/cases/focus/focus_change.slint index 7094f2daa69..2a76afa40b4 100644 --- a/tests/cases/focus/focus_change.slint +++ b/tests/cases/focus/focus_change.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { width: 400phx; diff --git a/tests/cases/focus/focus_change_event.slint b/tests/cases/focus/focus_change_event.slint index 66817332aac..db7c006f7fe 100644 --- a/tests/cases/focus/focus_change_event.slint +++ b/tests/cases/focus/focus_change_event.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { width: 400phx; diff --git a/tests/cases/focus/focus_change_subcompo.slint b/tests/cases/focus/focus_change_subcompo.slint index 8f04baf1181..22b92d53fc9 100644 --- a/tests/cases/focus/focus_change_subcompo.slint +++ b/tests/cases/focus/focus_change_subcompo.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test that the correct item indices are computed when focusing // children of sub-components or their roots. diff --git a/tests/cases/focus/focus_change_through_signal.slint b/tests/cases/focus/focus_change_through_signal.slint index b8ea240c17b..cf9443b0896 100644 --- a/tests/cases/focus/focus_change_through_signal.slint +++ b/tests/cases/focus/focus_change_through_signal.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 SubElement := Rectangle { property text <=> input.text; diff --git a/tests/cases/focus/forward.slint b/tests/cases/focus/forward.slint index b05feccd0bb..a31aeeff70d 100644 --- a/tests/cases/focus/forward.slint +++ b/tests/cases/focus/forward.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { width: 400phx; diff --git a/tests/cases/focus/initial_focus.slint b/tests/cases/focus/initial_focus.slint index 4abd93a5228..e25a7ab0924 100644 --- a/tests/cases/focus/initial_focus.slint +++ b/tests/cases/focus/initial_focus.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { width: 400phx; diff --git a/tests/cases/focus/initial_focus_through_component.slint b/tests/cases/focus/initial_focus_through_component.slint index a1a1ba7a07a..e0692529c38 100644 --- a/tests/cases/focus/initial_focus_through_component.slint +++ b/tests/cases/focus/initial_focus_through_component.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 MyTextInput := TextInput { } diff --git a/tests/cases/focus/initial_focus_through_layout.slint b/tests/cases/focus/initial_focus_through_layout.slint index e5c9a08da6e..1437db4ba76 100644 --- a/tests/cases/focus/initial_focus_through_layout.slint +++ b/tests/cases/focus/initial_focus_through_layout.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TextComponent := GridLayout { property has_focus: my_text_input.has_focus; diff --git a/tests/cases/focus/keyboard_focus.slint b/tests/cases/focus/keyboard_focus.slint index 239d8b42a8a..8ef84f430a2 100644 --- a/tests/cases/focus/keyboard_focus.slint +++ b/tests/cases/focus/keyboard_focus.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { SpinBox, LineEdit, HorizontalBox, VerticalBox, TabWidget } from "std-widgets.slint"; diff --git a/tests/cases/focus/keyboard_focus2.slint b/tests/cases/focus/keyboard_focus2.slint index 84d55466182..7dec3947cb1 100644 --- a/tests/cases/focus/keyboard_focus2.slint +++ b/tests/cases/focus/keyboard_focus2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore backtab diff --git a/tests/cases/focus/text-input-focused.slint b/tests/cases/focus/text-input-focused.slint index f85bb430ce2..93db6c63de5 100644 --- a/tests/cases/focus/text-input-focused.slint +++ b/tests/cases/focus/text-input-focused.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { LineEdit } from "std-widgets.slint"; diff --git a/tests/cases/globals/alias_to_global.slint b/tests/cases/globals/alias_to_global.slint index c86592e50c9..31cfacb7dcc 100644 --- a/tests/cases/globals/alias_to_global.slint +++ b/tests/cases/globals/alias_to_global.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics } from "std-widgets.slint"; diff --git a/tests/cases/globals/global_accessor_api.slint b/tests/cases/globals/global_accessor_api.slint index fc3daa43f56..aa0d4589a14 100644 --- a/tests/cases/globals/global_accessor_api.slint +++ b/tests/cases/globals/global_accessor_api.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //include_path: ../../helper_components diff --git a/tests/cases/globals/global_alias.slint b/tests/cases/globals/global_alias.slint index 542fbf93322..29c952fb932 100644 --- a/tests/cases/globals/global_alias.slint +++ b/tests/cases/globals/global_alias.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //include_path: ../../helper_components diff --git a/tests/cases/globals/global_binding.slint b/tests/cases/globals/global_binding.slint index 4644d222ccb..dbe449aa3e7 100644 --- a/tests/cases/globals/global_binding.slint +++ b/tests/cases/globals/global_binding.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 global Glob := { property a_alias <=> a; diff --git a/tests/cases/globals/global_binding_const.slint b/tests/cases/globals/global_binding_const.slint index d9cc6e35e69..71c43f2fbd1 100644 --- a/tests/cases/globals/global_binding_const.slint +++ b/tests/cases/globals/global_binding_const.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // This tests that constant property from global are properly initialized diff --git a/tests/cases/globals/global_callback.slint b/tests/cases/globals/global_callback.slint index 2c2b66c09c2..f35dce13fbb 100644 --- a/tests/cases/globals/global_callback.slint +++ b/tests/cases/globals/global_callback.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 global Glo := { property hello: 42; diff --git a/tests/cases/globals/global_depends_on_global.slint b/tests/cases/globals/global_depends_on_global.slint index 561071026d0..7b973cf18e3 100644 --- a/tests/cases/globals/global_depends_on_global.slint +++ b/tests/cases/globals/global_depends_on_global.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 global Numbers := { diff --git a/tests/cases/globals/issue_2064_two_way_default_value.slint b/tests/cases/globals/issue_2064_two_way_default_value.slint index 462c9da1dac..b582ab89b97 100644 --- a/tests/cases/globals/issue_2064_two_way_default_value.slint +++ b/tests/cases/globals/issue_2064_two_way_default_value.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export global MyGlobal { in-out property foo: false; diff --git a/tests/cases/imports/duplicated_name.slint b/tests/cases/imports/duplicated_name.slint index 6c94f43ff2a..8911762f0b4 100644 --- a/tests/cases/imports/duplicated_name.slint +++ b/tests/cases/imports/duplicated_name.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //include_path: ../../helper_components import { ColorButton } from "test_button.slint"; diff --git a/tests/cases/imports/exported_component.slint b/tests/cases/imports/exported_component.slint index 768ef90bf28..697119dc416 100644 --- a/tests/cases/imports/exported_component.slint +++ b/tests/cases/imports/exported_component.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export ExportedA := Rectangle {} NotExported := ExportedA { diff --git a/tests/cases/imports/external_globals.slint b/tests/cases/imports/external_globals.slint index 0ff65cd606b..1d50e361a2f 100644 --- a/tests/cases/imports/external_globals.slint +++ b/tests/cases/imports/external_globals.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //include_path: ../../helper_components import { UseGlobal } from "export_globals.slint"; diff --git a/tests/cases/imports/external_globals_nameclash.slint b/tests/cases/imports/external_globals_nameclash.slint index 95a1dee76d3..84b5ddbe470 100644 --- a/tests/cases/imports/external_globals_nameclash.slint +++ b/tests/cases/imports/external_globals_nameclash.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //include_path: ../../helper_components import { UseGlobal, ExportedGlobal as FromExport } from "export_globals.slint"; diff --git a/tests/cases/imports/external_structs.slint b/tests/cases/imports/external_structs.slint index 07a287e68d7..64fff5c018d 100644 --- a/tests/cases/imports/external_structs.slint +++ b/tests/cases/imports/external_structs.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //include_path: ../../helper_components import { UseStruct , ExportedStruct, ExportEnum } from "export_structs.slint"; diff --git a/tests/cases/imports/external_type.slint b/tests/cases/imports/external_type.slint index f8ef3a83690..6afad7f41ac 100644 --- a/tests/cases/imports/external_type.slint +++ b/tests/cases/imports/external_type.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //include_path: ../../helper_components import { TestButton as RealButton } from "test_button.slint"; diff --git a/tests/cases/imports/import_multi.slint b/tests/cases/imports/import_multi.slint index a3460f1374e..cd4b424cd06 100644 --- a/tests/cases/imports/import_multi.slint +++ b/tests/cases/imports/import_multi.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ExportedA } from "./exported_component.slint"; import { ExportedB } from "./exported_component.slint"; diff --git a/tests/cases/imports/just_import.slint b/tests/cases/imports/just_import.slint index 021de58b4ce..30655190d2f 100644 --- a/tests/cases/imports/just_import.slint +++ b/tests/cases/imports/just_import.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //include_path: ../../helper_components import { MainWindow } from "main_window.slint"; diff --git a/tests/cases/imports/library.slint b/tests/cases/imports/library.slint index 7f7266bd97c..208a340f548 100644 --- a/tests/cases/imports/library.slint +++ b/tests/cases/imports/library.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //library_path(helper_components): ../../helper_components/ //library_path(helper_buttons): ../../helper_components/test_button.slint diff --git a/tests/cases/imports/reexport.slint b/tests/cases/imports/reexport.slint index ee1da4fd257..234cc37397c 100644 --- a/tests/cases/imports/reexport.slint +++ b/tests/cases/imports/reexport.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //include_path: ../../helper_components import { TestButton, ColorButton } from "re_export_all.slint"; diff --git a/tests/cases/input/clip_mouse.slint b/tests/cases/input/clip_mouse.slint index 30ccb85fe03..5999e93778b 100644 --- a/tests/cases/input/clip_mouse.slint +++ b/tests/cases/input/clip_mouse.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component Clip { // the presence of a Clip element should not impact the rest diff --git a/tests/cases/input/scroll-event.slint b/tests/cases/input/scroll-event.slint index 48e4930776c..23b74fd6d76 100644 --- a/tests/cases/input/scroll-event.slint +++ b/tests/cases/input/scroll-event.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase inherits Window { diff --git a/tests/cases/input/visible_mouse.slint b/tests/cases/input/visible_mouse.slint index 1d2b354b429..74b8e9eb829 100644 --- a/tests/cases/input/visible_mouse.slint +++ b/tests/cases/input/visible_mouse.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component Clip { // the presence of a Clip element should not impact the rest diff --git a/tests/cases/issues/issue_1837_percent_comparison.slint b/tests/cases/issues/issue_1837_percent_comparison.slint index 1fec9df44bd..60c0dd44920 100644 --- a/tests/cases/issues/issue_1837_percent_comparison.slint +++ b/tests/cases/issues/issue_1837_percent_comparison.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Inner := Rectangle { property val; diff --git a/tests/cases/issues/issue_1846_visibility_in_for.slint b/tests/cases/issues/issue_1846_visibility_in_for.slint index aaaff9b0d66..478caed7ea9 100644 --- a/tests/cases/issues/issue_1846_visibility_in_for.slint +++ b/tests/cases/issues/issue_1846_visibility_in_for.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { diff --git a/tests/cases/issues/issue_2483_access_spacing.slint b/tests/cases/issues/issue_2483_access_spacing.slint index 79ab78ec244..51a006501cc 100644 --- a/tests/cases/issues/issue_2483_access_spacing.slint +++ b/tests/cases/issues/issue_2483_access_spacing.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component Test { VerticalLayout { diff --git a/tests/cases/issues/issue_2598_listview_reuse_elem.slint b/tests/cases/issues/issue_2598_listview_reuse_elem.slint index c3f8427ea3a..b0d06cc0131 100644 --- a/tests/cases/issues/issue_2598_listview_reuse_elem.slint +++ b/tests/cases/issues/issue_2598_listview_reuse_elem.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ListView } from "std-widgets.slint"; diff --git a/tests/cases/issues/issue_2608_canon_img_path.slint b/tests/cases/issues/issue_2608_canon_img_path.slint index 2d855a82610..8248ecf8416 100644 --- a/tests/cases/issues/issue_2608_canon_img_path.slint +++ b/tests/cases/issues/issue_2608_canon_img_path.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //include_path: ../../../examples/printerdemo/ui/images/ diff --git a/tests/cases/issues/issue_2717_has-hover.slint b/tests/cases/issues/issue_2717_has-hover.slint index a046fd74c31..90ab58bff97 100644 --- a/tests/cases/issues/issue_2717_has-hover.slint +++ b/tests/cases/issues/issue_2717_has-hover.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase inherits Window { width: 600px; diff --git a/tests/cases/issues/issue_2780_listview_crash.slint b/tests/cases/issues/issue_2780_listview_crash.slint index 09e596bd419..5f386acb365 100644 --- a/tests/cases/issues/issue_2780_listview_crash.slint +++ b/tests/cases/issues/issue_2780_listview_crash.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // This test case verifies that the listview updates its layout / geometry when the // entire model changes. This test works by triggering layout updates by simulating diff --git a/tests/cases/issues/issue_3107_if_optimized_rect.slint b/tests/cases/issues/issue_3107_if_optimized_rect.slint index 75825cc385c..216e8ff6294 100644 --- a/tests/cases/issues/issue_3107_if_optimized_rect.slint +++ b/tests/cases/issues/issue_3107_if_optimized_rect.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component TestComponent { in-out property check; diff --git a/tests/cases/issues/issue_3318_window_size.slint b/tests/cases/issues/issue_3318_window_size.slint index 8f4ea744b4d..56611d253d5 100644 --- a/tests/cases/issues/issue_3318_window_size.slint +++ b/tests/cases/issues/issue_3318_window_size.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase { VerticalLayout { diff --git a/tests/cases/issues/issue_3561_return_image.slint b/tests/cases/issues/issue_3561_return_image.slint index 01335228e7a..f821e238c31 100644 --- a/tests/cases/issues/issue_3561_return_image.slint +++ b/tests/cases/issues/issue_3561_return_image.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export enum IconType { add, diff --git a/tests/cases/issues/issue_4072_optimized_alias.slint b/tests/cases/issues/issue_4072_optimized_alias.slint index 49bb84d1d5a..686b60a911b 100644 --- a/tests/cases/issues/issue_4072_optimized_alias.slint +++ b/tests/cases/issues/issue_4072_optimized_alias.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component Wrapper inherits Rectangle { border-color: blue; diff --git a/tests/cases/issues/issue_4241_alias-const.slint b/tests/cases/issues/issue_4241_alias-const.slint index fbf62a0aaeb..f283609ab24 100644 --- a/tests/cases/issues/issue_4241_alias-const.slint +++ b/tests/cases/issues/issue_4241_alias-const.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component SpinBoxBase { diff --git a/tests/cases/issues/issue_4884_show_popup.slint b/tests/cases/issues/issue_4884_show_popup.slint index 47cf839f399..30a9c43787d 100644 --- a/tests/cases/issues/issue_4884_show_popup.slint +++ b/tests/cases/issues/issue_4884_show_popup.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component DialogBox inherits Rectangle { callback show-dialog(); diff --git a/tests/cases/issues/issue_4942_no_else_value.slint b/tests/cases/issues/issue_4942_no_else_value.slint index 48ef5f8c00a..d7658f7b7c1 100644 --- a/tests/cases/issues/issue_4942_no_else_value.slint +++ b/tests/cases/issues/issue_4942_no_else_value.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase { diff --git a/tests/cases/issues/member_fun_from_parent.slint b/tests/cases/issues/member_fun_from_parent.slint index dec3c3ce42c..03a5e4c0937 100644 --- a/tests/cases/issues/member_fun_from_parent.slint +++ b/tests/cases/issues/member_fun_from_parent.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Make sure that we generate the correct code to call a built-in member function through a parent. diff --git a/tests/cases/issues/name_conflicts.slint b/tests/cases/issues/name_conflicts.slint index e0fb788578b..4d6c1080a4b 100644 --- a/tests/cases/issues/name_conflicts.slint +++ b/tests/cases/issues/name_conflicts.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export struct Color { diff --git a/tests/cases/layout/box_alignment.slint b/tests/cases/layout/box_alignment.slint index 86471288607..f094d242256 100644 --- a/tests/cases/layout/box_alignment.slint +++ b/tests/cases/layout/box_alignment.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 MyWid := Rectangle { min-width: 20phx; diff --git a/tests/cases/layout/box_precentages.slint b/tests/cases/layout/box_precentages.slint index b77c40a69f6..68d27852608 100644 --- a/tests/cases/layout/box_precentages.slint +++ b/tests/cases/layout/box_precentages.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { width: 300phx; diff --git a/tests/cases/layout/box_preferred_size.slint b/tests/cases/layout/box_preferred_size.slint index 0661f797ae9..8cd274ed47e 100644 --- a/tests/cases/layout/box_preferred_size.slint +++ b/tests/cases/layout/box_preferred_size.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { background: green; diff --git a/tests/cases/layout/default_fill.slint b/tests/cases/layout/default_fill.slint index 564f27f475b..6ca52891f95 100644 --- a/tests/cases/layout/default_fill.slint +++ b/tests/cases/layout/default_fill.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component SubSub inherits Rectangle { width: 30phx; diff --git a/tests/cases/layout/flickable_in_layout.slint b/tests/cases/layout/flickable_in_layout.slint index fe598259aba..4641d162c1e 100644 --- a/tests/cases/layout/flickable_in_layout.slint +++ b/tests/cases/layout/flickable_in_layout.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Window { VerticalLayout { diff --git a/tests/cases/layout/geometry_center_by_default.slint b/tests/cases/layout/geometry_center_by_default.slint index 91479bda857..08cd3a94f99 100644 --- a/tests/cases/layout/geometry_center_by_default.slint +++ b/tests/cases/layout/geometry_center_by_default.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 global G { public pure function is-center(pos: length, size: length, parent: length) -> bool { diff --git a/tests/cases/layout/grid.slint b/tests/cases/layout/grid.slint index 0961670c78f..50e401ec4c7 100644 --- a/tests/cases/layout/grid.slint +++ b/tests/cases/layout/grid.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { width: 300phx; diff --git a/tests/cases/layout/grid2.slint b/tests/cases/layout/grid2.slint index d99c8743f7a..7fa7b437a23 100644 --- a/tests/cases/layout/grid2.slint +++ b/tests/cases/layout/grid2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { width: 200phx; diff --git a/tests/cases/layout/grid_fixed_size.slint b/tests/cases/layout/grid_fixed_size.slint index 885cd0d5b86..b6bfbdc3adb 100644 --- a/tests/cases/layout/grid_fixed_size.slint +++ b/tests/cases/layout/grid_fixed_size.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 SubWithConstraints := Rectangle { diff --git a/tests/cases/layout/grid_min_max.slint b/tests/cases/layout/grid_min_max.slint index 46e23f2e149..17039e86a43 100644 --- a/tests/cases/layout/grid_min_max.slint +++ b/tests/cases/layout/grid_min_max.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test the maximum and minimum size within a grid layout diff --git a/tests/cases/layout/grid_padding.slint b/tests/cases/layout/grid_padding.slint index 487835182a2..f57d05e9b0f 100644 --- a/tests/cases/layout/grid_padding.slint +++ b/tests/cases/layout/grid_padding.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { width: 600phx; diff --git a/tests/cases/layout/grid_preferred_size.slint b/tests/cases/layout/grid_preferred_size.slint index a2e7634b48d..22714e6a189 100644 --- a/tests/cases/layout/grid_preferred_size.slint +++ b/tests/cases/layout/grid_preferred_size.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { background: green; diff --git a/tests/cases/layout/grid_spacing.slint b/tests/cases/layout/grid_spacing.slint index 9050288fc81..85ce2dbf7bf 100644 --- a/tests/cases/layout/grid_spacing.slint +++ b/tests/cases/layout/grid_spacing.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { width: 600phx; diff --git a/tests/cases/layout/grid_span.slint b/tests/cases/layout/grid_span.slint index 3c528396814..7b6499171e1 100644 --- a/tests/cases/layout/grid_span.slint +++ b/tests/cases/layout/grid_span.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { width: 400phx; diff --git a/tests/cases/layout/grid_within_for.slint b/tests/cases/layout/grid_within_for.slint index cf35341df71..753e5291181 100644 --- a/tests/cases/layout/grid_within_for.slint +++ b/tests/cases/layout/grid_within_for.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Regression test for a panic in the compiler diff --git a/tests/cases/layout/height_for_width.slint b/tests/cases/layout/height_for_width.slint index 545e1019604..b396a434a6c 100644 --- a/tests/cases/layout/height_for_width.slint +++ b/tests/cases/layout/height_for_width.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //include_path: ../../../examples/printerdemo/ui/images/ TestCase := Rectangle { diff --git a/tests/cases/layout/horizontal_for.slint b/tests/cases/layout/horizontal_for.slint index 4ad0e0d8ab3..59a3d006635 100644 --- a/tests/cases/layout/horizontal_for.slint +++ b/tests/cases/layout/horizontal_for.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Rectangle { width: 100phx; diff --git a/tests/cases/layout/horizontal_sizes.slint b/tests/cases/layout/horizontal_sizes.slint index e1af98965b0..0393378fe77 100644 --- a/tests/cases/layout/horizontal_sizes.slint +++ b/tests/cases/layout/horizontal_sizes.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { width: 300phx; diff --git a/tests/cases/layout/issue_1057_listview_subcomponent_height.slint b/tests/cases/layout/issue_1057_listview_subcomponent_height.slint index 6ae2e13c525..5a2911326ac 100644 --- a/tests/cases/layout/issue_1057_listview_subcomponent_height.slint +++ b/tests/cases/layout/issue_1057_listview_subcomponent_height.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ListView } from "std-widgets.slint"; diff --git a/tests/cases/layout/issue_1072_opacity_geometry.slint b/tests/cases/layout/issue_1072_opacity_geometry.slint index f7ca5ef9f92..cb28a72030d 100644 --- a/tests/cases/layout/issue_1072_opacity_geometry.slint +++ b/tests/cases/layout/issue_1072_opacity_geometry.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test that the x and y property of a Rectangle with opacity are consistant diff --git a/tests/cases/layout/issue_140.slint b/tests/cases/layout/issue_140.slint index 9d8d7e9b33d..ed26d55b053 100644 --- a/tests/cases/layout/issue_140.slint +++ b/tests/cases/layout/issue_140.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 HelloWorld := Window { HorizontalLayout { diff --git a/tests/cases/layout/issue_147_for_explicit_size.slint b/tests/cases/layout/issue_147_for_explicit_size.slint index 399e37df456..1f12377e22d 100644 --- a/tests/cases/layout/issue_147_for_explicit_size.slint +++ b/tests/cases/layout/issue_147_for_explicit_size.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { width: 500px; diff --git a/tests/cases/layout/issue_147_for_explicit_size_merge.slint b/tests/cases/layout/issue_147_for_explicit_size_merge.slint index 2f319bf3be1..353ae6363a4 100644 --- a/tests/cases/layout/issue_147_for_explicit_size_merge.slint +++ b/tests/cases/layout/issue_147_for_explicit_size_merge.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { width: 500px; diff --git a/tests/cases/layout/issue_149_nested_for.slint b/tests/cases/layout/issue_149_nested_for.slint index 3bed3a4898a..a7efeb2240d 100644 --- a/tests/cases/layout/issue_149_nested_for.slint +++ b/tests/cases/layout/issue_149_nested_for.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { width: 300phx; diff --git a/tests/cases/layout/issue_160_box_min_max.slint b/tests/cases/layout/issue_160_box_min_max.slint index 8f3861ce14d..af143d26c5b 100644 --- a/tests/cases/layout/issue_160_box_min_max.slint +++ b/tests/cases/layout/issue_160_box_min_max.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Window { width: 600px; diff --git a/tests/cases/layout/issue_167_if_relayout.slint b/tests/cases/layout/issue_167_if_relayout.slint index bfaa2a54f34..d9faf803a4b 100644 --- a/tests/cases/layout/issue_167_if_relayout.slint +++ b/tests/cases/layout/issue_167_if_relayout.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { width: 300px; diff --git a/tests/cases/layout/issue_2537_visible_in_listview.slint b/tests/cases/layout/issue_2537_visible_in_listview.slint index 3efde709708..7df10c36655 100644 --- a/tests/cases/layout/issue_2537_visible_in_listview.slint +++ b/tests/cases/layout/issue_2537_visible_in_listview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // FIXME: currently the layout is broken, but at least it shouldn't panic diff --git a/tests/cases/layout/issue_407_for_layout_in_flickable.slint b/tests/cases/layout/issue_407_for_layout_in_flickable.slint index a3c5567bdd4..9d1eed70d66 100644 --- a/tests/cases/layout/issue_407_for_layout_in_flickable.slint +++ b/tests/cases/layout/issue_407_for_layout_in_flickable.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export Testcase := Window { preferred-width: 640px; diff --git a/tests/cases/layout/issue_553_materialized_init.slint b/tests/cases/layout/issue_553_materialized_init.slint index c54fc562817..edbeb547965 100644 --- a/tests/cases/layout/issue_553_materialized_init.slint +++ b/tests/cases/layout/issue_553_materialized_init.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test the propagation of maximum and minimum size through nested grid layouts diff --git a/tests/cases/layout/issue_783_constraint_from_children.slint b/tests/cases/layout/issue_783_constraint_from_children.slint index cf2524580ce..171422facc2 100644 --- a/tests/cases/layout/issue_783_constraint_from_children.slint +++ b/tests/cases/layout/issue_783_constraint_from_children.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component TestCase { r1 := Rectangle {} diff --git a/tests/cases/layout/materialized_minmax.slint b/tests/cases/layout/materialized_minmax.slint index 9ec0b901b20..5b898dab889 100644 --- a/tests/cases/layout/materialized_minmax.slint +++ b/tests/cases/layout/materialized_minmax.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test the propagation of maximum and minimum size through nested grid layouts diff --git a/tests/cases/layout/nested_boxes.slint b/tests/cases/layout/nested_boxes.slint index 93849943d37..980f2e7dbd1 100644 --- a/tests/cases/layout/nested_boxes.slint +++ b/tests/cases/layout/nested_boxes.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 RectRed := Rectangle { diff --git a/tests/cases/layout/nested_grid.slint b/tests/cases/layout/nested_grid.slint index 3fce263b03d..211f18dd991 100644 --- a/tests/cases/layout/nested_grid.slint +++ b/tests/cases/layout/nested_grid.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { width: 300phx; diff --git a/tests/cases/layout/nested_grid_2.slint b/tests/cases/layout/nested_grid_2.slint index 0eaee0ebfc8..6efda8df45c 100644 --- a/tests/cases/layout/nested_grid_2.slint +++ b/tests/cases/layout/nested_grid_2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { width: 300phx; diff --git a/tests/cases/layout/nested_grid_minmax.slint b/tests/cases/layout/nested_grid_minmax.slint index f84b926f25c..a6b298e0763 100644 --- a/tests/cases/layout/nested_grid_minmax.slint +++ b/tests/cases/layout/nested_grid_minmax.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test the propagation of maximum and minimum size through nested grid layouts diff --git a/tests/cases/layout/opacity_in_layout.slint b/tests/cases/layout/opacity_in_layout.slint index 225ea4c5ff4..59fa3c6f06b 100644 --- a/tests/cases/layout/opacity_in_layout.slint +++ b/tests/cases/layout/opacity_in_layout.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Window { layout1 := VerticalLayout { diff --git a/tests/cases/layout/override_from_parent.slint b/tests/cases/layout/override_from_parent.slint index 88c733153f1..ba5fd8fe8c2 100644 --- a/tests/cases/layout/override_from_parent.slint +++ b/tests/cases/layout/override_from_parent.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 ComboBox := Rectangle { min-width: 60px; diff --git a/tests/cases/layout/special_default_geometry.slint b/tests/cases/layout/special_default_geometry.slint index 0e4d3d57ece..ca6f8cb31d3 100644 --- a/tests/cases/layout/special_default_geometry.slint +++ b/tests/cases/layout/special_default_geometry.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test that the default geometry is taken from the right parent, even when some //of visible or opacity or so are set diff --git a/tests/cases/layout/text_no_wrap.slint b/tests/cases/layout/text_no_wrap.slint index c5769f4219e..d1b8919c0ab 100644 --- a/tests/cases/layout/text_no_wrap.slint +++ b/tests/cases/layout/text_no_wrap.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // A Text that does not use word wrap's height should not depends on the width diff --git a/tests/cases/layout/text_preferred_size.slint b/tests/cases/layout/text_preferred_size.slint index 52db85fd7aa..784c3050f36 100644 --- a/tests/cases/layout/text_preferred_size.slint +++ b/tests/cases/layout/text_preferred_size.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component TextTextGeomWithOpacityOrClip { diff --git a/tests/cases/layout/vertical_if.slint b/tests/cases/layout/vertical_if.slint index 0a68f1fc020..0707577452c 100644 --- a/tests/cases/layout/vertical_if.slint +++ b/tests/cases/layout/vertical_if.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Window { width: 100phx; diff --git a/tests/cases/layout/window_fixed.slint b/tests/cases/layout/window_fixed.slint index 25a8b13b581..227e7fcf1e9 100644 --- a/tests/cases/layout/window_fixed.slint +++ b/tests/cases/layout/window_fixed.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase inherits Window { width: 200px; diff --git a/tests/cases/layout/window_preferred.slint b/tests/cases/layout/window_preferred.slint index c4918b53d6f..fcfbfc6d9b0 100644 --- a/tests/cases/layout/window_preferred.slint +++ b/tests/cases/layout/window_preferred.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { VerticalLayout { diff --git a/tests/cases/lookup/global_lookup.slint b/tests/cases/lookup/global_lookup.slint index 2b4589bb1ba..2ed1a3c1bb9 100644 --- a/tests/cases/lookup/global_lookup.slint +++ b/tests/cases/lookup/global_lookup.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 global MyGlobal := { property bar: 5; diff --git a/tests/cases/lookup/id_lookup.slint b/tests/cases/lookup/id_lookup.slint index ea9ee2bba7a..c0bc745b1dc 100644 --- a/tests/cases/lookup/id_lookup.slint +++ b/tests/cases/lookup/id_lookup.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { diff --git a/tests/cases/lookup/renamed_elements.slint b/tests/cases/lookup/renamed_elements.slint index 64b55336ab0..fbcbf3556d2 100644 --- a/tests/cases/lookup/renamed_elements.slint +++ b/tests/cases/lookup/renamed_elements.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 PopupWindow := Rectangle {} diff --git a/tests/cases/lookup/rust_names.slint b/tests/cases/lookup/rust_names.slint index 8f1a91b630a..f4616db33bd 100644 --- a/tests/cases/lookup/rust_names.slint +++ b/tests/cases/lookup/rust_names.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Just use some of the internal names used in Slint to make sure it still compiles diff --git a/tests/cases/models/array.slint b/tests/cases/models/array.slint index e50af60bb4e..450f80a1c90 100644 --- a/tests/cases/models/array.slint +++ b/tests/cases/models/array.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Rectangle { property<[int]> ints: [1, 2, 3, 4, 5]; diff --git a/tests/cases/models/assign_equal_model.slint b/tests/cases/models/assign_equal_model.slint index d918e36993e..0d37eb1e438 100644 --- a/tests/cases/models/assign_equal_model.slint +++ b/tests/cases/models/assign_equal_model.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property <[int]> foo: [1, 2, 3]; diff --git a/tests/cases/models/delete_from_clicked.slint b/tests/cases/models/delete_from_clicked.slint index 4d41f60d2dd..9775a610f3a 100644 --- a/tests/cases/models/delete_from_clicked.slint +++ b/tests/cases/models/delete_from_clicked.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export global Glob { in-out property <[string]> model: ["Hello", "World"]; diff --git a/tests/cases/models/for.slint b/tests/cases/models/for.slint index a6653f79b2e..8d8942ca8c3 100644 --- a/tests/cases/models/for.slint +++ b/tests/cases/models/for.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 ExtraComponent := Rectangle { for x in [{a: "0"}, {a: "1"}] : Text { text: x.a; } diff --git a/tests/cases/models/if.slint b/tests/cases/models/if.slint index e2a643606d2..ef7a1bb79d3 100644 --- a/tests/cases/models/if.slint +++ b/tests/cases/models/if.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { width: 100phx; diff --git a/tests/cases/models/if_cond_property.slint b/tests/cases/models/if_cond_property.slint index 33481473639..06ba17e427c 100644 --- a/tests/cases/models/if_cond_property.slint +++ b/tests/cases/models/if_cond_property.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test that the condition of an if can access the properties of native items diff --git a/tests/cases/models/if_lookup.slint b/tests/cases/models/if_lookup.slint index 0d3fb7b2a77..5c230a2ed21 100644 --- a/tests/cases/models/if_lookup.slint +++ b/tests/cases/models/if_lookup.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 diff --git a/tests/cases/models/issue_4961_model_index_property.slint b/tests/cases/models/issue_4961_model_index_property.slint index 8dd8279f17c..7c38cde217b 100644 --- a/tests/cases/models/issue_4961_model_index_property.slint +++ b/tests/cases/models/issue_4961_model_index_property.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase { width: 100px; diff --git a/tests/cases/models/listview_model_change.slint b/tests/cases/models/listview_model_change.slint index b84dea09853..8901e361c42 100644 --- a/tests/cases/models/listview_model_change.slint +++ b/tests/cases/models/listview_model_change.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // This test case verifies that the listview updates its layout / geometry when the // entire model changes. This test works by triggering layout updates by simulating diff --git a/tests/cases/models/model.slint b/tests/cases/models/model.slint index b611fd17237..c74d6be893d 100644 --- a/tests/cases/models/model.slint +++ b/tests/cases/models/model.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { diff --git a/tests/cases/models/model_in_struct.slint b/tests/cases/models/model_in_struct.slint index 4ff98105b13..5571881642e 100644 --- a/tests/cases/models/model_in_struct.slint +++ b/tests/cases/models/model_in_struct.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 struct Foo := { ok: bool, diff --git a/tests/cases/models/negative_intmodel.slint b/tests/cases/models/negative_intmodel.slint index 0ac5802e1e9..9d3a6190d9b 100644 --- a/tests/cases/models/negative_intmodel.slint +++ b/tests/cases/models/negative_intmodel.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 diff --git a/tests/cases/models/scrolled_model.slint b/tests/cases/models/scrolled_model.slint index f1e7911759f..22bfb5ff3f1 100644 --- a/tests/cases/models/scrolled_model.slint +++ b/tests/cases/models/scrolled_model.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Button, ListView } from "std-widgets.slint"; diff --git a/tests/cases/models/write_to_model.slint b/tests/cases/models/write_to_model.slint index 99251a290e0..c4b1579279a 100644 --- a/tests/cases/models/write_to_model.slint +++ b/tests/cases/models/write_to_model.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { diff --git a/tests/cases/models/write_to_model_listview.slint b/tests/cases/models/write_to_model_listview.slint index 9f77b378885..863d82eb3d3 100644 --- a/tests/cases/models/write_to_model_listview.slint +++ b/tests/cases/models/write_to_model_listview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ListView } from "std-widgets.slint"; diff --git a/tests/cases/models/write_to_model_sub_component.slint b/tests/cases/models/write_to_model_sub_component.slint index e69e52a08ff..b4b963b83c9 100644 --- a/tests/cases/models/write_to_model_sub_component.slint +++ b/tests/cases/models/write_to_model_sub_component.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 SubComponent := Rectangle { diff --git a/tests/cases/properties/animation_from_click.slint b/tests/cases/properties/animation_from_click.slint index 402f13a618c..786659778ac 100644 --- a/tests/cases/properties/animation_from_click.slint +++ b/tests/cases/properties/animation_from_click.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { width: 120px; diff --git a/tests/cases/properties/animation_from_click_in_repeated_4741.slint b/tests/cases/properties/animation_from_click_in_repeated_4741.slint index 38da58f4d6c..ff5339a64ff 100644 --- a/tests/cases/properties/animation_from_click_in_repeated_4741.slint +++ b/tests/cases/properties/animation_from_click_in_repeated_4741.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Issue 4741 diff --git a/tests/cases/properties/animation_merging.slint b/tests/cases/properties/animation_merging.slint index d35c30c3ee1..d72d6b511c0 100644 --- a/tests/cases/properties/animation_merging.slint +++ b/tests/cases/properties/animation_merging.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 AnimatedObject := Rectangle { diff --git a/tests/cases/properties/animation_props_depends.slint b/tests/cases/properties/animation_props_depends.slint index 38686f14ab6..ea5a78c6bdd 100644 --- a/tests/cases/properties/animation_props_depends.slint +++ b/tests/cases/properties/animation_props_depends.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 component Slider { in-out property value; diff --git a/tests/cases/properties/border_radius.slint b/tests/cases/properties/border_radius.slint index 5aa59be36f3..177a443e97d 100644 --- a/tests/cases/properties/border_radius.slint +++ b/tests/cases/properties/border_radius.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase { rect := Rectangle { diff --git a/tests/cases/properties/dashes.slint b/tests/cases/properties/dashes.slint index a33b57c2644..b1d05e1757f 100644 --- a/tests/cases/properties/dashes.slint +++ b/tests/cases/properties/dashes.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Test-Case := Rectangle { diff --git a/tests/cases/properties/delayed_transitions.slint b/tests/cases/properties/delayed_transitions.slint index aa29ed01579..fe4674b2924 100644 --- a/tests/cases/properties/delayed_transitions.slint +++ b/tests/cases/properties/delayed_transitions.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property top_level: 4; diff --git a/tests/cases/properties/issue1237_states_visible.slint b/tests/cases/properties/issue1237_states_visible.slint index dccee31a41f..8cb640b0627 100644 --- a/tests/cases/properties/issue1237_states_visible.slint +++ b/tests/cases/properties/issue1237_states_visible.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { width: 100px; diff --git a/tests/cases/properties/issue5038_state_in_base.slint b/tests/cases/properties/issue5038_state_in_base.slint index da0113c4a0e..10f499689e7 100644 --- a/tests/cases/properties/issue5038_state_in_base.slint +++ b/tests/cases/properties/issue5038_state_in_base.slint @@ -1,5 +1,5 @@ // Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial export global Glob { in-out property cond2; diff --git a/tests/cases/properties/property_animation.slint b/tests/cases/properties/property_animation.slint index e50d1cf3439..ec048c2701e 100644 --- a/tests/cases/properties/property_animation.slint +++ b/tests/cases/properties/property_animation.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property xx : 1000; diff --git a/tests/cases/properties/property_animation_restart.slint b/tests/cases/properties/property_animation_restart.slint index 76a91c81aff..b14cc843d60 100644 --- a/tests/cases/properties/property_animation_restart.slint +++ b/tests/cases/properties/property_animation_restart.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase { in property xx : 1000; diff --git a/tests/cases/properties/states.slint b/tests/cases/properties/states.slint index 3731d432c7b..ffcfd1402db 100644 --- a/tests/cases/properties/states.slint +++ b/tests/cases/properties/states.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 diff --git a/tests/cases/properties/states_with_animation.slint b/tests/cases/properties/states_with_animation.slint index 30290c6d924..62336f3430c 100644 --- a/tests/cases/properties/states_with_animation.slint +++ b/tests/cases/properties/states_with_animation.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property active_index: 0; diff --git a/tests/cases/properties/transitions.slint b/tests/cases/properties/transitions.slint index b2843fb9073..a0777846d53 100644 --- a/tests/cases/properties/transitions.slint +++ b/tests/cases/properties/transitions.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property top_level: 4; diff --git a/tests/cases/properties/transitions2.slint b/tests/cases/properties/transitions2.slint index 72a29a7c623..7f9c5473cc7 100644 --- a/tests/cases/properties/transitions2.slint +++ b/tests/cases/properties/transitions2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { diff --git a/tests/cases/simple.slint b/tests/cases/simple.slint index 3b7c010c69b..19384c650ae 100644 --- a/tests/cases/simple.slint +++ b/tests/cases/simple.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { diff --git a/tests/cases/subcomponents/nested_repeater.slint b/tests/cases/subcomponents/nested_repeater.slint index 54233e79c14..e8d77a9e247 100644 --- a/tests/cases/subcomponents/nested_repeater.slint +++ b/tests/cases/subcomponents/nested_repeater.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Verify that we can instantiate sub-components in nested repeaters // and succeed in generating code that determines the root correctly, diff --git a/tests/cases/subcomponents/no_children.slint b/tests/cases/subcomponents/no_children.slint index b45933f8e43..25a42773e65 100644 --- a/tests/cases/subcomponents/no_children.slint +++ b/tests/cases/subcomponents/no_children.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Verify that two repeaters (if and for) are placed correctly in the item tree // and matched in the dyn_visit closure. diff --git a/tests/cases/subcomponents/repeaters.slint b/tests/cases/subcomponents/repeaters.slint index 399f10f5725..fdc77cdfac3 100644 --- a/tests/cases/subcomponents/repeaters.slint +++ b/tests/cases/subcomponents/repeaters.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Verify that two repeaters (if and for) are placed correctly in the item tree // and matched in the dyn_visit closure. diff --git a/tests/cases/test_infrastructure.slint b/tests/cases/test_infrastructure.slint index f4645dc9841..f5ab80223e9 100644 --- a/tests/cases/test_infrastructure.slint +++ b/tests/cases/test_infrastructure.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase { } diff --git a/tests/cases/text/control_keys_input.slint b/tests/cases/text/control_keys_input.slint index 64776cd329d..270066b3a43 100644 --- a/tests/cases/text/control_keys_input.slint +++ b/tests/cases/text/control_keys_input.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { width: 100phx; diff --git a/tests/cases/text/cursor_move.slint b/tests/cases/text/cursor_move.slint index 76f94d7c519..c4910395cd3 100644 --- a/tests/cases/text/cursor_move.slint +++ b/tests/cases/text/cursor_move.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := TextInput { width: 100phx; diff --git a/tests/cases/text/cursor_move_grapheme.slint b/tests/cases/text/cursor_move_grapheme.slint index 64e06e1794d..e36dfe2a6b5 100644 --- a/tests/cases/text/cursor_move_grapheme.slint +++ b/tests/cases/text/cursor_move_grapheme.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := TextInput { width: 100phx; diff --git a/tests/cases/text/custom_font.slint b/tests/cases/text/custom_font.slint index 3c4d16a5afc..888e73b53d8 100644 --- a/tests/cases/text/custom_font.slint +++ b/tests/cases/text/custom_font.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // This test imports a custom font and declares it for use, to ensure at least that the generated init code for // the custom font setup compiles. diff --git a/tests/cases/text/cut.slint b/tests/cases/text/cut.slint index 176b5f54f66..d54bb69c6a0 100644 --- a/tests/cases/text/cut.slint +++ b/tests/cases/text/cut.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := TextInput { width: 100phx; diff --git a/tests/cases/text/default_color.slint b/tests/cases/text/default_color.slint index 6bae728b5ae..9c0edfe85ca 100644 --- a/tests/cases/text/default_color.slint +++ b/tests/cases/text/default_color.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StyleMetrics } from "std-widgets.slint"; diff --git a/tests/cases/text/input_type.slint b/tests/cases/text/input_type.slint index 3324e4385bd..15e2dae65bd 100644 --- a/tests/cases/text/input_type.slint +++ b/tests/cases/text/input_type.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := TextInput { text: "hello"; diff --git a/tests/cases/text/input_type_decimal.slint b/tests/cases/text/input_type_decimal.slint index e3cd47f5244..3f685e570fd 100644 --- a/tests/cases/text/input_type_decimal.slint +++ b/tests/cases/text/input_type_decimal.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { width: 100phx; diff --git a/tests/cases/text/input_type_number.slint b/tests/cases/text/input_type_number.slint index c020585280e..16539262a9c 100644 --- a/tests/cases/text/input_type_number.slint +++ b/tests/cases/text/input_type_number.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { width: 100phx; diff --git a/tests/cases/text/key_repeat.slint b/tests/cases/text/key_repeat.slint index 0307fe1fe73..70de2b8c8b7 100644 --- a/tests/cases/text/key_repeat.slint +++ b/tests/cases/text/key_repeat.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { width: 100phx; diff --git a/tests/cases/text/keyboard_modifiers.slint b/tests/cases/text/keyboard_modifiers.slint index 6ab98313cc1..d980e914700 100644 --- a/tests/cases/text/keyboard_modifiers.slint +++ b/tests/cases/text/keyboard_modifiers.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { width: 100phx; diff --git a/tests/cases/text/select_all.slint b/tests/cases/text/select_all.slint index 416025d7967..f4745909282 100644 --- a/tests/cases/text/select_all.slint +++ b/tests/cases/text/select_all.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := TextInput { width: 100phx; diff --git a/tests/cases/text/select_double_click.slint b/tests/cases/text/select_double_click.slint index 2e7e483dfb3..a5b3254dd29 100644 --- a/tests/cases/text/select_double_click.slint +++ b/tests/cases/text/select_double_click.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := TextInput { width: 120phx; diff --git a/tests/cases/text/select_dribble_click.slint b/tests/cases/text/select_dribble_click.slint index 821a4d6ad2f..8bdd3d63af9 100644 --- a/tests/cases/text/select_dribble_click.slint +++ b/tests/cases/text/select_dribble_click.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := TextInput { width: 100phx; diff --git a/tests/cases/text/surrogate_cursor.slint b/tests/cases/text/surrogate_cursor.slint index 159a9f8354c..0877ecc48ee 100644 --- a/tests/cases/text/surrogate_cursor.slint +++ b/tests/cases/text/surrogate_cursor.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := TextInput { width: 100phx; diff --git a/tests/cases/text/text_change.slint b/tests/cases/text/text_change.slint index 696b11c12e2..42c48740d1d 100644 --- a/tests/cases/text/text_change.slint +++ b/tests/cases/text/text_change.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { width: 100phx; diff --git a/tests/cases/text/text_property_change.slint b/tests/cases/text/text_property_change.slint index d38851bbd7f..b8f0ddf5a20 100644 --- a/tests/cases/text/text_property_change.slint +++ b/tests/cases/text/text_property_change.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test that the diff --git a/tests/cases/text/textinput_functions.slint b/tests/cases/text/textinput_functions.slint index 38a2a6acac5..73478e35a15 100644 --- a/tests/cases/text/textinput_functions.slint +++ b/tests/cases/text/textinput_functions.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase { width: 100phx; diff --git a/tests/cases/text/undo_redo.slint b/tests/cases/text/undo_redo.slint index 3fe180fea1f..646707c137b 100644 --- a/tests/cases/text/undo_redo.slint +++ b/tests/cases/text/undo_redo.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := TextInput { width: 100phx; diff --git a/tests/cases/types/angles.slint b/tests/cases/types/angles.slint index 949e66dbd30..34ff0dfb79e 100644 --- a/tests/cases/types/angles.slint +++ b/tests/cases/types/angles.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Test := Rectangle { property angle: 0.25turn; diff --git a/tests/cases/types/array.slint b/tests/cases/types/array.slint index 70ef0382d7f..fa0e3ed2eab 100644 --- a/tests/cases/types/array.slint +++ b/tests/cases/types/array.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export struct Player := { diff --git a/tests/cases/types/array_of_array.slint b/tests/cases/types/array_of_array.slint index 61c9e8127b3..e5bb8bfa41d 100644 --- a/tests/cases/types/array_of_array.slint +++ b/tests/cases/types/array_of_array.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 struct KeySlot { width-u: float, spacer: bool, background: color, font-size: length, } struct Row { key-slots: [KeySlot], } diff --git a/tests/cases/types/bool.slint b/tests/cases/types/bool.slint index 74df865952a..2d477529a2e 100644 --- a/tests/cases/types/bool.slint +++ b/tests/cases/types/bool.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property truevar: true; diff --git a/tests/cases/types/brush.slint b/tests/cases/types/brush.slint index 9d6bb61c6b6..37c69c5b88c 100644 --- a/tests/cases/types/brush.slint +++ b/tests/cases/types/brush.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Test := Rectangle { // allow declaring brush properties and assigning colors diff --git a/tests/cases/types/color.slint b/tests/cases/types/color.slint index 71614f6ed8d..75c85377280 100644 --- a/tests/cases/types/color.slint +++ b/tests/cases/types/color.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Test := Rectangle { property b1: blue; diff --git a/tests/cases/types/cubic-bezier.slint b/tests/cases/types/cubic-bezier.slint index 6c713f0491e..6e72ec42b52 100644 --- a/tests/cases/types/cubic-bezier.slint +++ b/tests/cases/types/cubic-bezier.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test that cubic-bezier() can accept negative numbers diff --git a/tests/cases/types/duration.slint b/tests/cases/types/duration.slint index 4cbda213a9e..777f1e29635 100644 --- a/tests/cases/types/duration.slint +++ b/tests/cases/types/duration.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property d1: 100ms; diff --git a/tests/cases/types/enum_compare.slint b/tests/cases/types/enum_compare.slint index af16030eb37..8571843eb63 100644 --- a/tests/cases/types/enum_compare.slint +++ b/tests/cases/types/enum_compare.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property hello: word-wrap; diff --git a/tests/cases/types/enums.slint b/tests/cases/types/enums.slint index d318628da04..0e84cae437b 100644 --- a/tests/cases/types/enums.slint +++ b/tests/cases/types/enums.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export enum Foo { bli, bla, blu } diff --git a/tests/cases/types/functions.slint b/tests/cases/types/functions.slint index b585e059282..ef2238ee87c 100644 --- a/tests/cases/types/functions.slint +++ b/tests/cases/types/functions.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test that structs work if they are only referenced by functions diff --git a/tests/cases/types/gradients.slint b/tests/cases/types/gradients.slint index 3df5ee5b63a..a8f94801282 100644 --- a/tests/cases/types/gradients.slint +++ b/tests/cases/types/gradients.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Verify that this compiles with all generators diff --git a/tests/cases/types/length.slint b/tests/cases/types/length.slint index d98a4cba53f..d69340f4816 100644 --- a/tests/cases/types/length.slint +++ b/tests/cases/types/length.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property l1: 12phx; diff --git a/tests/cases/types/nested_struct.slint b/tests/cases/types/nested_struct.slint index f256bbfb4b7..0d21146b022 100644 --- a/tests/cases/types/nested_struct.slint +++ b/tests/cases/types/nested_struct.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // This test case verifies that we do emit the code for the `Nested` struct, // when it's only indirectly referenced through the `Item` struct. diff --git a/tests/cases/types/object.slint b/tests/cases/types/object.slint index 65eaabe92d3..f7038c1c168 100644 --- a/tests/cases/types/object.slint +++ b/tests/cases/types/object.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property<{a: string, b: int}> foo: {a : "444", b: 12 }; diff --git a/tests/cases/types/percent.slint b/tests/cases/types/percent.slint index b4e8c67bf9c..08035db547b 100644 --- a/tests/cases/types/percent.slint +++ b/tests/cases/types/percent.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Rectangle { property p1: 100%; diff --git a/tests/cases/types/relative_lengths.slint b/tests/cases/types/relative_lengths.slint index 3cab5fdf5dd..351ad55ac03 100644 --- a/tests/cases/types/relative_lengths.slint +++ b/tests/cases/types/relative_lengths.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 Sub := Rectangle { width: 25%; diff --git a/tests/cases/types/rem.slint b/tests/cases/types/rem.slint index f39818aadf5..7237432365d 100644 --- a/tests/cases/types/rem.slint +++ b/tests/cases/types/rem.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 global SomeGlobal := { property global_rem: 4rem; diff --git a/tests/cases/types/resource.slint b/tests/cases/types/resource.slint index 2185d7aae7a..c1d2a5ec1cd 100644 --- a/tests/cases/types/resource.slint +++ b/tests/cases/types/resource.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //include_path: ../../../examples/printerdemo/ui/images/ TestCase := Rectangle { diff --git a/tests/cases/types/string.slint b/tests/cases/types/string.slint index 8eff97969c6..00862a26351 100644 --- a/tests/cases/types/string.slint +++ b/tests/cases/types/string.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase { in-out property p1: "hello"; diff --git a/tests/cases/types/string_to_float.slint b/tests/cases/types/string_to_float.slint index 3419c3b889a..fcf468596dc 100644 --- a/tests/cases/types/string_to_float.slint +++ b/tests/cases/types/string_to_float.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase { in property hello: "hello"; diff --git a/tests/cases/types/structs.slint b/tests/cases/types/structs.slint index 30a449ad3b8..c213e5a706f 100644 --- a/tests/cases/types/structs.slint +++ b/tests/cases/types/structs.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export struct Player := { name: string, diff --git a/tests/cases/types/structs2.slint b/tests/cases/types/structs2.slint index 4c72239a0a2..71d570413c9 100644 --- a/tests/cases/types/structs2.slint +++ b/tests/cases/types/structs2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Test that structs work if they are only referenced by callbacks diff --git a/tests/cases/types/structs_keyword.slint b/tests/cases/types/structs_keyword.slint index 41eecdc6c59..643697c165c 100644 --- a/tests/cases/types/structs_keyword.slint +++ b/tests/cases/types/structs_keyword.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Right now, this test is only testing rust keyword, but it should be expanded to JS and C++ keywords diff --git a/tests/cases/widgets/combobox.slint b/tests/cases/widgets/combobox.slint index dd819b622c3..53dc8b9d18b 100644 --- a/tests/cases/widgets/combobox.slint +++ b/tests/cases/widgets/combobox.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { ComboBox } from "std-widgets.slint"; export component TestCase inherits Window { diff --git a/tests/cases/widgets/listview.slint b/tests/cases/widgets/listview.slint index 7f4281aef0c..918d823a49f 100644 --- a/tests/cases/widgets/listview.slint +++ b/tests/cases/widgets/listview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StandardListView } from "std-widgets.slint"; diff --git a/tests/cases/widgets/slider_basic.slint b/tests/cases/widgets/slider_basic.slint index e0a18d656a3..4ba624140f2 100644 --- a/tests/cases/widgets/slider_basic.slint +++ b/tests/cases/widgets/slider_basic.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Slider } from "std-widgets.slint"; diff --git a/tests/cases/widgets/spinbox_basic.slint b/tests/cases/widgets/spinbox_basic.slint index 956db7f5a86..267ea07c20e 100644 --- a/tests/cases/widgets/spinbox_basic.slint +++ b/tests/cases/widgets/spinbox_basic.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // FIXME: Ignore the SpinBox test with the Qt style because it doesn't support editing (#4690) diff --git a/tests/cases/widgets/tableview.slint b/tests/cases/widgets/tableview.slint index 20249b15205..2ebfdfeb3da 100644 --- a/tests/cases/widgets/tableview.slint +++ b/tests/cases/widgets/tableview.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { StandardTableView } from "std-widgets.slint"; diff --git a/tests/doctests/Cargo.toml b/tests/doctests/Cargo.toml index a8111108ccb..d47877ba124 100644 --- a/tests/doctests/Cargo.toml +++ b/tests/doctests/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "doctests" diff --git a/tests/doctests/build.rs b/tests/doctests/build.rs index deaa75e65cc..a59fd01955a 100644 --- a/tests/doctests/build.rs +++ b/tests/doctests/build.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::io::{BufWriter, Write}; use std::path::Path; diff --git a/tests/doctests/main.rs b/tests/doctests/main.rs index d8e6cbc83da..06fa6df2032 100644 --- a/tests/doctests/main.rs +++ b/tests/doctests/main.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![allow(uncommon_codepoints)] diff --git a/tests/driver/cpp/Cargo.toml b/tests/driver/cpp/Cargo.toml index 7ac61fb8247..f37b11c2fa4 100644 --- a/tests/driver/cpp/Cargo.toml +++ b/tests/driver/cpp/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "test-driver-cpp" diff --git a/tests/driver/cpp/build.rs b/tests/driver/cpp/build.rs index 138847b3c02..54212d3bf91 100644 --- a/tests/driver/cpp/build.rs +++ b/tests/driver/cpp/build.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::io::{BufWriter, Write}; use std::path::{Path, PathBuf}; diff --git a/tests/driver/cpp/cppdriver.rs b/tests/driver/cpp/cppdriver.rs index 6c79e0aef7b..a7498e3973e 100644 --- a/tests/driver/cpp/cppdriver.rs +++ b/tests/driver/cpp/cppdriver.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_compiler::{diagnostics::BuildDiagnostics, *}; use std::error::Error; diff --git a/tests/driver/cpp/main.rs b/tests/driver/cpp/main.rs index e5ce3b1a5ea..d153c0c9fda 100644 --- a/tests/driver/cpp/main.rs +++ b/tests/driver/cpp/main.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #[cfg(test)] mod cppdriver; diff --git a/tests/driver/driverlib/Cargo.toml b/tests/driver/driverlib/Cargo.toml index 9444f9d2006..c0856fdcbc2 100644 --- a/tests/driver/driverlib/Cargo.toml +++ b/tests/driver/driverlib/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "test_driver_lib" diff --git a/tests/driver/driverlib/lib.rs b/tests/driver/driverlib/lib.rs index c6f7e1dbe86..f98127ddf9e 100644 --- a/tests/driver/driverlib/lib.rs +++ b/tests/driver/driverlib/lib.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::path::PathBuf; diff --git a/tests/driver/interpreter/Cargo.toml b/tests/driver/interpreter/Cargo.toml index 527b214f7e5..32a70e23a16 100644 --- a/tests/driver/interpreter/Cargo.toml +++ b/tests/driver/interpreter/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "test-driver-interpreter" diff --git a/tests/driver/interpreter/build.rs b/tests/driver/interpreter/build.rs index 187f352f048..214be16156c 100644 --- a/tests/driver/interpreter/build.rs +++ b/tests/driver/interpreter/build.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::io::Write; diff --git a/tests/driver/interpreter/interpreter.rs b/tests/driver/interpreter/interpreter.rs index d00d6dd1913..426e7d5eb69 100644 --- a/tests/driver/interpreter/interpreter.rs +++ b/tests/driver/interpreter/interpreter.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use itertools::Itertools; use slint_interpreter::{DiagnosticLevel, Value, ValueType}; diff --git a/tests/driver/interpreter/main.rs b/tests/driver/interpreter/main.rs index fb6685fddf6..e35795402a4 100644 --- a/tests/driver/interpreter/main.rs +++ b/tests/driver/interpreter/main.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #[cfg(test)] mod interpreter; diff --git a/tests/driver/nodejs/Cargo.toml b/tests/driver/nodejs/Cargo.toml index 6ac86065638..277a865b8a4 100644 --- a/tests/driver/nodejs/Cargo.toml +++ b/tests/driver/nodejs/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "test-driver-nodejs" diff --git a/tests/driver/nodejs/build.rs b/tests/driver/nodejs/build.rs index 825e53136f2..1dab6bb0169 100644 --- a/tests/driver/nodejs/build.rs +++ b/tests/driver/nodejs/build.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::io::Write; use std::path::PathBuf; diff --git a/tests/driver/nodejs/main.rs b/tests/driver/nodejs/main.rs index 4bbd833ca96..89c8fc94ca4 100644 --- a/tests/driver/nodejs/main.rs +++ b/tests/driver/nodejs/main.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #[cfg(test)] mod nodejs; diff --git a/tests/driver/nodejs/nodejs.rs b/tests/driver/nodejs/nodejs.rs index e125d701661..a2a9bf2f3f9 100644 --- a/tests/driver/nodejs/nodejs.rs +++ b/tests/driver/nodejs/nodejs.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::error::Error; use std::{fs::File, io::Write, path::PathBuf}; diff --git a/tests/driver/rust/Cargo.toml b/tests/driver/rust/Cargo.toml index 7f46f191024..e435bd0c68a 100644 --- a/tests/driver/rust/Cargo.toml +++ b/tests/driver/rust/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "test-driver-rust" diff --git a/tests/driver/rust/build.rs b/tests/driver/rust/build.rs index a0f161c7b5c..dcda9811c65 100644 --- a/tests/driver/rust/build.rs +++ b/tests/driver/rust/build.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::io::{BufWriter, Write}; use std::path::Path; diff --git a/tests/driver/rust/main.rs b/tests/driver/rust/main.rs index 81911b24bda..a9e5cbb0028 100644 --- a/tests/driver/rust/main.rs +++ b/tests/driver/rust/main.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![deny(warnings)] #![deny(rust_2018_idioms)] diff --git a/tests/helper_components/export_globals.slint b/tests/helper_components/export_globals.slint index ad45ea17777..8a07a35c34f 100644 --- a/tests/helper_components/export_globals.slint +++ b/tests/helper_components/export_globals.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 global NotExported := { diff --git a/tests/helper_components/export_structs.slint b/tests/helper_components/export_structs.slint index 92abd3a46de..3cff4b7368e 100644 --- a/tests/helper_components/export_structs.slint +++ b/tests/helper_components/export_structs.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 struct NotExportedStruct0 := { a: int } diff --git a/tests/helper_components/main_window.slint b/tests/helper_components/main_window.slint index f0d6751853d..4df10cb93b0 100644 --- a/tests/helper_components/main_window.slint +++ b/tests/helper_components/main_window.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export MainWindow := Window { property some_prop: 42; diff --git a/tests/helper_components/re_export.slint b/tests/helper_components/re_export.slint index f91bb5a9ab6..45e8d9ddcd6 100644 --- a/tests/helper_components/re_export.slint +++ b/tests/helper_components/re_export.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { TestButton } from "./test_button.slint"; export { TestButton } diff --git a/tests/helper_components/re_export_all.slint b/tests/helper_components/re_export_all.slint index d471fc8be32..ff288385811 100644 --- a/tests/helper_components/re_export_all.slint +++ b/tests/helper_components/re_export_all.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export * from "./test_button.slint"; diff --git a/tests/helper_components/test_button.slint b/tests/helper_components/test_button.slint index 63cc29548eb..78da490aeea 100644 --- a/tests/helper_components/test_button.slint +++ b/tests/helper_components/test_button.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestButtonImpl := Rectangle { property button_text; diff --git a/tests/manual/opacity_inheritance.slint b/tests/manual/opacity_inheritance.slint index 914febaf1a8..36058686d6c 100644 --- a/tests/manual/opacity_inheritance.slint +++ b/tests/manual/opacity_inheritance.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export TestCase := Window { preferred-width: 800px; diff --git a/tests/screenshots/Cargo.toml b/tests/screenshots/Cargo.toml index a7c337b1242..f78a2ba2867 100644 --- a/tests/screenshots/Cargo.toml +++ b/tests/screenshots/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "test-driver-screenshots" diff --git a/tests/screenshots/build.rs b/tests/screenshots/build.rs index 91527641474..5073da6bda6 100644 --- a/tests/screenshots/build.rs +++ b/tests/screenshots/build.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::io::{BufWriter, Write}; use std::path::Path; diff --git a/tests/screenshots/cases/software/basic/border-image-repeat.slint b/tests/screenshots/cases/software/basic/border-image-repeat.slint index 3f19ef3956c..9d05ed3e24d 100644 --- a/tests/screenshots/cases/software/basic/border-image-repeat.slint +++ b/tests/screenshots/cases/software/basic/border-image-repeat.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Slider } from "std-widgets.slint"; diff --git a/tests/screenshots/cases/software/basic/border-image.slint b/tests/screenshots/cases/software/basic/border-image.slint index f4dde8eaf30..00560ea8534 100644 --- a/tests/screenshots/cases/software/basic/border-image.slint +++ b/tests/screenshots/cases/software/basic/border-image.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Slider } from "std-widgets.slint"; diff --git a/tests/screenshots/cases/software/basic/border-image2.slint b/tests/screenshots/cases/software/basic/border-image2.slint index 97791728f60..723ca5189e0 100644 --- a/tests/screenshots/cases/software/basic/border-image2.slint +++ b/tests/screenshots/cases/software/basic/border-image2.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Slider } from "std-widgets.slint"; diff --git a/tests/screenshots/cases/software/basic/border.slint b/tests/screenshots/cases/software/basic/border.slint index ea9c9458a33..a2d664d3175 100644 --- a/tests/screenshots/cases/software/basic/border.slint +++ b/tests/screenshots/cases/software/basic/border.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // ROTATION_THRESHOLD=45 - the border radius algoritm don't give the same result from every rotation diff --git a/tests/screenshots/cases/software/basic/image-repeat.slint b/tests/screenshots/cases/software/basic/image-repeat.slint index aab7bb81a7c..35f851e7213 100644 --- a/tests/screenshots/cases/software/basic/image-repeat.slint +++ b/tests/screenshots/cases/software/basic/image-repeat.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Slider } from "std-widgets.slint"; diff --git a/tests/screenshots/cases/software/basic/images-alignment.slint b/tests/screenshots/cases/software/basic/images-alignment.slint index a6fb44a0dae..cb9e0bcfb2f 100644 --- a/tests/screenshots/cases/software/basic/images-alignment.slint +++ b/tests/screenshots/cases/software/basic/images-alignment.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Slider } from "std-widgets.slint"; diff --git a/tests/screenshots/cases/software/basic/images-scale_factor.slint b/tests/screenshots/cases/software/basic/images-scale_factor.slint index 1ab9aea838c..ba136e9d9e5 100644 --- a/tests/screenshots/cases/software/basic/images-scale_factor.slint +++ b/tests/screenshots/cases/software/basic/images-scale_factor.slint @@ -1,5 +1,5 @@ // Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial import { Slider } from "std-widgets.slint"; diff --git a/tests/screenshots/cases/software/basic/images.slint b/tests/screenshots/cases/software/basic/images.slint index bd1a6f7841e..9e5fd378b8d 100644 --- a/tests/screenshots/cases/software/basic/images.slint +++ b/tests/screenshots/cases/software/basic/images.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Slider } from "std-widgets.slint"; diff --git a/tests/screenshots/cases/software/basic/linear-gradients.slint b/tests/screenshots/cases/software/basic/linear-gradients.slint index c7c934e18f9..832eea52c01 100644 --- a/tests/screenshots/cases/software/basic/linear-gradients.slint +++ b/tests/screenshots/cases/software/basic/linear-gradients.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // ROTATION_THRESHOLD=150 - because gradients are very imprecise in rotation diff --git a/tests/screenshots/cases/software/basic/rgb.slint b/tests/screenshots/cases/software/basic/rgb.slint index 1a287b84903..2aaa7ec0182 100644 --- a/tests/screenshots/cases/software/basic/rgb.slint +++ b/tests/screenshots/cases/software/basic/rgb.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { width: 64px; diff --git a/tests/screenshots/cases/software/basic/set-selection-offsets.slint b/tests/screenshots/cases/software/basic/set-selection-offsets.slint index 2d4f77e1b12..7a28f5251a4 100644 --- a/tests/screenshots/cases/software/basic/set-selection-offsets.slint +++ b/tests/screenshots/cases/software/basic/set-selection-offsets.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase inherits Window { width: 64phx; diff --git a/tests/screenshots/cases/software/basic/text-clipped.slint b/tests/screenshots/cases/software/basic/text-clipped.slint index b32e0b63173..fb395721f8f 100644 --- a/tests/screenshots/cases/software/basic/text-clipped.slint +++ b/tests/screenshots/cases/software/basic/text-clipped.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // SLINT_SCALE_FACTOR=1.5 diff --git a/tests/screenshots/cases/software/basic/text-elided.slint b/tests/screenshots/cases/software/basic/text-elided.slint index 3dcc7d81d30..802a017ae9a 100644 --- a/tests/screenshots/cases/software/basic/text-elided.slint +++ b/tests/screenshots/cases/software/basic/text-elided.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase inherits Window { width: 64px; diff --git a/tests/screenshots/cases/software/basic/text-input-selection.slint b/tests/screenshots/cases/software/basic/text-input-selection.slint index ef1ab478918..bb2926a9b18 100644 --- a/tests/screenshots/cases/software/basic/text-input-selection.slint +++ b/tests/screenshots/cases/software/basic/text-input-selection.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { width: 64px; diff --git a/tests/screenshots/cases/software/basic/text-input.slint b/tests/screenshots/cases/software/basic/text-input.slint index dc9e4a4e3c5..b8ba029f72f 100644 --- a/tests/screenshots/cases/software/basic/text-input.slint +++ b/tests/screenshots/cases/software/basic/text-input.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 TestCase := Window { width: 64px; diff --git a/tests/screenshots/cases/software/basic/text.slint b/tests/screenshots/cases/software/basic/text.slint index 06f7b249047..04d6feb1bb4 100644 --- a/tests/screenshots/cases/software/basic/text.slint +++ b/tests/screenshots/cases/software/basic/text.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase inherits Window { width: 64px; diff --git a/tests/screenshots/cases/software/basic/translucent-background.slint b/tests/screenshots/cases/software/basic/translucent-background.slint index 393c04eb7c6..213ddb5ed08 100644 --- a/tests/screenshots/cases/software/basic/translucent-background.slint +++ b/tests/screenshots/cases/software/basic/translucent-background.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export component TestCase inherits Window { width: 64px; diff --git a/tests/screenshots/main.rs b/tests/screenshots/main.rs index b53e3c049d3..b60611487a0 100644 --- a/tests/screenshots/main.rs +++ b/tests/screenshots/main.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![deny(warnings)] diff --git a/tests/screenshots/testing.rs b/tests/screenshots/testing.rs index c2cee395e75..d4a7da6a84a 100644 --- a/tests/screenshots/testing.rs +++ b/tests/screenshots/testing.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore powf diff --git a/tools/compiler/Cargo.toml b/tools/compiler/Cargo.toml index 4b993c37af0..4e6f90eaf01 100644 --- a/tools/compiler/Cargo.toml +++ b/tools/compiler/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "slint-compiler" diff --git a/tools/compiler/main.rs b/tools/compiler/main.rs index c82ec8d8b7d..1e9d3735ef7 100644 --- a/tools/compiler/main.rs +++ b/tools/compiler/main.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use clap::{Parser, ValueEnum}; use i_slint_compiler::diagnostics::BuildDiagnostics; diff --git a/tools/figma_import/Cargo.toml b/tools/figma_import/Cargo.toml index e4653777fc0..9420b99a088 100644 --- a/tools/figma_import/Cargo.toml +++ b/tools/figma_import/Cargo.toml @@ -1,10 +1,18 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "figma_import" description = "A figma file importer for Slint" +<<<<<<< HEAD +license = "GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial" +======= license = "GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial" +>>>>>>> 303633443647db52f33842b9707e25e3067db232 authors.workspace = true edition.workspace = true homepage.workspace = true diff --git a/tools/figma_import/README.md b/tools/figma_import/README.md index 82bcecaa3d7..fa4646c7800 100644 --- a/tools/figma_import/README.md +++ b/tools/figma_import/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # figma_import: Figma to Slint import tool diff --git a/tools/figma_import/src/figmatypes.rs b/tools/figma_import/src/figmatypes.rs index bf9394e50cf..dfbcbbbd140 100644 --- a/tools/figma_import/src/figmatypes.rs +++ b/tools/figma_import/src/figmatypes.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![allow(unused)] diff --git a/tools/figma_import/src/main.rs b/tools/figma_import/src/main.rs index 68056a5416e..fe5c87a6560 100644 --- a/tools/figma_import/src/main.rs +++ b/tools/figma_import/src/main.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![allow(non_snake_case)] #![allow(non_camel_case_types)] diff --git a/tools/figma_import/src/rendered.rs b/tools/figma_import/src/rendered.rs index 9c19f71e319..c1740c4fe6c 100644 --- a/tools/figma_import/src/rendered.rs +++ b/tools/figma_import/src/rendered.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::figmatypes::{self, *}; use std::collections::HashMap; diff --git a/tools/lsp/Cargo.toml b/tools/lsp/Cargo.toml index dfd6b012697..9d42f0b9d83 100644 --- a/tools/lsp/Cargo.toml +++ b/tools/lsp/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "slint-lsp" diff --git a/tools/lsp/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/tools/lsp/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..4225e094c5d --- /dev/null +++ b/tools/lsp/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/tools/lsp/README.md b/tools/lsp/README.md index 9484ce8326c..00f8a91efdb 100644 --- a/tools/lsp/README.md +++ b/tools/lsp/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # LSP (Language Server Protocol) Server for Slint diff --git a/tools/lsp/build.rs b/tools/lsp/build.rs index b4107b05d59..bc5eff4262e 100644 --- a/tools/lsp/build.rs +++ b/tools/lsp/build.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 fn main() { // Make the compiler handle ComponentContainer: diff --git a/tools/lsp/common.rs b/tools/lsp/common.rs index b1c2b705364..11ac28f1fa6 100644 --- a/tools/lsp/common.rs +++ b/tools/lsp/common.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Data structures common between LSP and previewer diff --git a/tools/lsp/fmt.rs b/tools/lsp/fmt.rs index a246d2ca067..fc9b3d9f4bf 100644 --- a/tools/lsp/fmt.rs +++ b/tools/lsp/fmt.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 pub mod fmt; #[cfg(not(target_arch = "wasm32"))] diff --git a/tools/lsp/fmt/README.md b/tools/lsp/fmt/README.md index 7f4e7bff9f8..8f00d1d22a8 100644 --- a/tools/lsp/fmt/README.md +++ b/tools/lsp/fmt/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Slint-fmt diff --git a/tools/lsp/fmt/fmt.rs b/tools/lsp/fmt/fmt.rs index cd8af0431fb..590b205afd7 100644 --- a/tools/lsp/fmt/fmt.rs +++ b/tools/lsp/fmt/fmt.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use super::writer::TokenWriter; use i_slint_compiler::parser::{syntax_nodes, NodeOrToken, SyntaxKind, SyntaxNode}; diff --git a/tools/lsp/fmt/tool.rs b/tools/lsp/fmt/tool.rs index 2a408d24ff8..c3b73925a4f 100644 --- a/tools/lsp/fmt/tool.rs +++ b/tools/lsp/fmt/tool.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /*! Work in progress for a formatter. diff --git a/tools/lsp/fmt/writer.rs b/tools/lsp/fmt/writer.rs index e549461da7b..f90d04953d3 100644 --- a/tools/lsp/fmt/writer.rs +++ b/tools/lsp/fmt/writer.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_compiler::parser::SyntaxToken; use std::io::Write; diff --git a/tools/lsp/language.rs b/tools/lsp/language.rs index 93173f48929..07448abb9f1 100644 --- a/tools/lsp/language.rs +++ b/tools/lsp/language.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore descr rfind unindented diff --git a/tools/lsp/language/completion.rs b/tools/lsp/language/completion.rs index e0f57623ffb..c95c233c2d8 100644 --- a/tools/lsp/language/completion.rs +++ b/tools/lsp/language/completion.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore rfind diff --git a/tools/lsp/language/component_catalog.rs b/tools/lsp/language/component_catalog.rs index ba4843e0cf9..cc6f1fd49b3 100644 --- a/tools/lsp/language/component_catalog.rs +++ b/tools/lsp/language/component_catalog.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore descr rfind unindented diff --git a/tools/lsp/language/formatting.rs b/tools/lsp/language/formatting.rs index 9d844d5986c..d3b8b87274b 100644 --- a/tools/lsp/language/formatting.rs +++ b/tools/lsp/language/formatting.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use super::DocumentCache; use crate::fmt::{fmt, writer}; diff --git a/tools/lsp/language/goto.rs b/tools/lsp/language/goto.rs index c5a84b7a978..992acbc518e 100644 --- a/tools/lsp/language/goto.rs +++ b/tools/lsp/language/goto.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use super::DocumentCache; use crate::util::{lookup_current_element_type, map_node_and_url, with_lookup_ctx}; diff --git a/tools/lsp/language/properties.rs b/tools/lsp/language/properties.rs index 487369645b9..e124e441410 100644 --- a/tools/lsp/language/properties.rs +++ b/tools/lsp/language/properties.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::common::{self, Result}; use crate::language; diff --git a/tools/lsp/language/semantic_tokens.rs b/tools/lsp/language/semantic_tokens.rs index eb9d39a9a8f..0f06b19f600 100644 --- a/tools/lsp/language/semantic_tokens.rs +++ b/tools/lsp/language/semantic_tokens.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_compiler::parser::SyntaxKind; use lsp_types::{ diff --git a/tools/lsp/language/test.rs b/tools/lsp/language/test.rs index 6be173f09c1..d3042ea6d14 100644 --- a/tools/lsp/language/test.rs +++ b/tools/lsp/language/test.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Code to help with writing tests for the language server diff --git a/tools/lsp/lsp_ext.rs b/tools/lsp/lsp_ext.rs index 597c510cf67..c58e47cf17f 100644 --- a/tools/lsp/lsp_ext.rs +++ b/tools/lsp/lsp_ext.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! Extensions to the LSP diff --git a/tools/lsp/main.rs b/tools/lsp/main.rs index def02cd0793..4a0c8f0ab6b 100644 --- a/tools/lsp/main.rs +++ b/tools/lsp/main.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![cfg(not(target_arch = "wasm32"))] diff --git a/tools/lsp/preview.rs b/tools/lsp/preview.rs index 953bd9e5f67..047c073c6cc 100644 --- a/tools/lsp/preview.rs +++ b/tools/lsp/preview.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::common::{self, ComponentInformation, ElementRcNode, PreviewComponent, PreviewConfig}; use crate::lsp_ext::Health; diff --git a/tools/lsp/preview/debug.rs b/tools/lsp/preview/debug.rs index 88b26005123..3b684c11a70 100644 --- a/tools/lsp/preview/debug.rs +++ b/tools/lsp/preview/debug.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore fillcolor fontcolor graphviz tpdf diff --git a/tools/lsp/preview/drop_location.rs b/tools/lsp/preview/drop_location.rs index 7535c2683d0..a52f1f21aa3 100644 --- a/tools/lsp/preview/drop_location.rs +++ b/tools/lsp/preview/drop_location.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_compiler::parser::SyntaxKind; use i_slint_core::lengths::{LogicalLength, LogicalPoint}; diff --git a/tools/lsp/preview/element_selection.rs b/tools/lsp/preview/element_selection.rs index d77a4b4544a..4a3ae6b76c7 100644 --- a/tools/lsp/preview/element_selection.rs +++ b/tools/lsp/preview/element_selection.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::{path::PathBuf, rc::Rc}; diff --git a/tools/lsp/preview/ext.rs b/tools/lsp/preview/ext.rs index e8e7684630d..8a92be39f44 100644 --- a/tools/lsp/preview/ext.rs +++ b/tools/lsp/preview/ext.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_compiler::layout; diff --git a/tools/lsp/preview/native.rs b/tools/lsp/preview/native.rs index 1f3d5ccb76c..6510e3def4a 100644 --- a/tools/lsp/preview/native.rs +++ b/tools/lsp/preview/native.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore condvar diff --git a/tools/lsp/preview/ui.rs b/tools/lsp/preview/ui.rs index de16132f74f..e3b0186760f 100644 --- a/tools/lsp/preview/ui.rs +++ b/tools/lsp/preview/ui.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use std::{collections::HashMap, iter::once, rc::Rc}; diff --git a/tools/lsp/preview/wasm.rs b/tools/lsp/preview/wasm.rs index 053c77625b1..4b5f31ac956 100644 --- a/tools/lsp/preview/wasm.rs +++ b/tools/lsp/preview/wasm.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! This wasm library can be loaded from JS to load and display the content of .slint files #![cfg(target_arch = "wasm32")] diff --git a/tools/lsp/ui/component-list.slint b/tools/lsp/ui/component-list.slint index cb4ce2be6ab..946efafa1b3 100644 --- a/tools/lsp/ui/component-list.slint +++ b/tools/lsp/ui/component-list.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Palette, ScrollView, VerticalBox, GroupBox } from "std-widgets.slint"; diff --git a/tools/lsp/ui/diagnostics-overlay.slint b/tools/lsp/ui/diagnostics-overlay.slint index fc0b5091b4d..8c39afdee8c 100644 --- a/tools/lsp/ui/diagnostics-overlay.slint +++ b/tools/lsp/ui/diagnostics-overlay.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore Heade diff --git a/tools/lsp/ui/draw-area.slint b/tools/lsp/ui/draw-area.slint index 4c60641ecc3..99a60aea801 100644 --- a/tools/lsp/ui/draw-area.slint +++ b/tools/lsp/ui/draw-area.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore resizer diff --git a/tools/lsp/ui/header-bar.slint b/tools/lsp/ui/header-bar.slint index 3182057aad8..3ea8f087902 100644 --- a/tools/lsp/ui/header-bar.slint +++ b/tools/lsp/ui/header-bar.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore Heade diff --git a/tools/lsp/ui/main.slint b/tools/lsp/ui/main.slint index 1ee8fbef6ac..0684b80b1e5 100644 --- a/tools/lsp/ui/main.slint +++ b/tools/lsp/ui/main.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore Heade diff --git a/tools/lsp/ui/resizer.slint b/tools/lsp/ui/resizer.slint index 0b54f2b1747..0fa86970a8c 100644 --- a/tools/lsp/ui/resizer.slint +++ b/tools/lsp/ui/resizer.slint @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore resizer diff --git a/tools/lsp/util.rs b/tools/lsp/util.rs index abbcad8f338..e933db3336b 100644 --- a/tools/lsp/util.rs +++ b/tools/lsp/util.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use i_slint_compiler::diagnostics::{DiagnosticLevel, SourceFile, Spanned}; use i_slint_compiler::langtype::{ElementType, Type}; diff --git a/tools/lsp/wasm_main.rs b/tools/lsp/wasm_main.rs index 92edd420b36..10016a936d9 100644 --- a/tools/lsp/wasm_main.rs +++ b/tools/lsp/wasm_main.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![cfg(target_arch = "wasm32")] diff --git a/tools/slintpad/README.md b/tools/slintpad/README.md index 0bcbeb9ad5d..c36b601c595 100644 --- a/tools/slintpad/README.md +++ b/tools/slintpad/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # SlintPad diff --git a/tools/slintpad/cypress.config.ts b/tools/slintpad/cypress.config.ts index 30dc0ff3156..81dd9c3a916 100644 --- a/tools/slintpad/cypress.config.ts +++ b/tools/slintpad/cypress.config.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore frsource diff --git a/tools/slintpad/cypress/e2e/smoke_test.cy.ts b/tools/slintpad/cypress/e2e/smoke_test.cy.ts index 5f18fae6479..4e027f1c1e2 100644 --- a/tools/slintpad/cypress/e2e/smoke_test.cy.ts +++ b/tools/slintpad/cypress/e2e/smoke_test.cy.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 describe("Smoke test", () => { it("passes", () => { diff --git a/tools/slintpad/cypress/plugins/index.ts b/tools/slintpad/cypress/plugins/index.ts index 589b74f057f..01fd50099af 100644 --- a/tools/slintpad/cypress/plugins/index.ts +++ b/tools/slintpad/cypress/plugins/index.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore frsource diff --git a/tools/slintpad/cypress/support/commands.ts b/tools/slintpad/cypress/support/commands.ts index 27655eaea5f..ad4ffa8afa2 100644 --- a/tools/slintpad/cypress/support/commands.ts +++ b/tools/slintpad/cypress/support/commands.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore frsource diff --git a/tools/slintpad/cypress/support/e2e.ts b/tools/slintpad/cypress/support/e2e.ts index c9b1f9d6ae4..447ed353d9a 100644 --- a/tools/slintpad/cypress/support/e2e.ts +++ b/tools/slintpad/cypress/support/e2e.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // Import commands.js using ES2015 syntax: import "./commands"; diff --git a/tools/slintpad/src/dialogs.ts b/tools/slintpad/src/dialogs.ts index 00df81e2d4c..0bbb4e3b459 100644 --- a/tools/slintpad/src/dialogs.ts +++ b/tools/slintpad/src/dialogs.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export function modal_dialog( extra_class: string, diff --git a/tools/slintpad/src/editor_widget.ts b/tools/slintpad/src/editor_widget.ts index 821a5a9c939..adb81a8d5f9 100644 --- a/tools/slintpad/src/editor_widget.ts +++ b/tools/slintpad/src/editor_widget.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore codingame lumino mimetypes printerdemo diff --git a/tools/slintpad/src/github.ts b/tools/slintpad/src/github.ts index 96a2be23b05..0e55432ae93 100644 --- a/tools/slintpad/src/github.ts +++ b/tools/slintpad/src/github.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { EditorWidget, UrlMapper, KnownUrlMapper } from "./editor_widget"; import { modal_dialog } from "./dialogs"; diff --git a/tools/slintpad/src/highlighting.ts b/tools/slintpad/src/highlighting.ts index daebd36defd..30494f67f31 100644 --- a/tools/slintpad/src/highlighting.ts +++ b/tools/slintpad/src/highlighting.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore abfnrtv diff --git a/tools/slintpad/src/index.ts b/tools/slintpad/src/index.ts index cad00eaa73c..aee835f0e41 100644 --- a/tools/slintpad/src/index.ts +++ b/tools/slintpad/src/index.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore cupertino lumino permalink diff --git a/tools/slintpad/src/lsp.ts b/tools/slintpad/src/lsp.ts index d3ee89aa706..7b778e6e57a 100644 --- a/tools/slintpad/src/lsp.ts +++ b/tools/slintpad/src/lsp.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { FilterProxyReader } from "./proxy"; import { diff --git a/tools/slintpad/src/lsp_integration.ts b/tools/slintpad/src/lsp_integration.ts index a83e817c63f..a092dce0031 100644 --- a/tools/slintpad/src/lsp_integration.ts +++ b/tools/slintpad/src/lsp_integration.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export { Position as LspPosition, diff --git a/tools/slintpad/src/outline_widget.ts b/tools/slintpad/src/outline_widget.ts index c81e6bc1d25..60bf3ef6ff0 100644 --- a/tools/slintpad/src/outline_widget.ts +++ b/tools/slintpad/src/outline_widget.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore lumino diff --git a/tools/slintpad/src/preview.ts b/tools/slintpad/src/preview.ts index bff835e935a..9c1f4269dbe 100644 --- a/tools/slintpad/src/preview.ts +++ b/tools/slintpad/src/preview.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import slint_init, * as slint from "@interpreter/slint_wasm_interpreter.js"; diff --git a/tools/slintpad/src/preview_widget.ts b/tools/slintpad/src/preview_widget.ts index ce539d0ba7c..907e2933ad1 100644 --- a/tools/slintpad/src/preview_widget.ts +++ b/tools/slintpad/src/preview_widget.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore bindgen lumino diff --git a/tools/slintpad/src/properties_widget.ts b/tools/slintpad/src/properties_widget.ts index f16ed75ca3e..a696c6243d3 100644 --- a/tools/slintpad/src/properties_widget.ts +++ b/tools/slintpad/src/properties_widget.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore lumino diff --git a/tools/slintpad/src/proxy.ts b/tools/slintpad/src/proxy.ts index 6e35a502c14..63365b5409b 100644 --- a/tools/slintpad/src/proxy.ts +++ b/tools/slintpad/src/proxy.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { MessageReader, diff --git a/tools/slintpad/src/shared/lsp_commands.ts b/tools/slintpad/src/shared/lsp_commands.ts index 7db68e56748..98e8a1192ce 100644 --- a/tools/slintpad/src/shared/lsp_commands.ts +++ b/tools/slintpad/src/shared/lsp_commands.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { PropertyQuery, SetBindingResponse } from "./properties"; diff --git a/tools/slintpad/src/shared/properties.ts b/tools/slintpad/src/shared/properties.ts index 4b095a9f709..cbfb0173e20 100644 --- a/tools/slintpad/src/shared/properties.ts +++ b/tools/slintpad/src/shared/properties.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import { Diagnostic, diff --git a/tools/slintpad/src/text.ts b/tools/slintpad/src/text.ts index e3e112c67c6..73f6659e8f4 100644 --- a/tools/slintpad/src/text.ts +++ b/tools/slintpad/src/text.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // import * as monaco from "monaco-editor/esm/vs/editor/editor.api"; import * as monaco from "monaco-editor"; diff --git a/tools/slintpad/src/types.ts b/tools/slintpad/src/types.ts index 107f84a1308..4136f5dca04 100644 --- a/tools/slintpad/src/types.ts +++ b/tools/slintpad/src/types.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // eslint-disable-next-line type DedicatedWorkerGlobalScope = any; // This type is defined in the `webworker` library, which is not compatible with `dom` diff --git a/tools/slintpad/src/welcome_widget.ts b/tools/slintpad/src/welcome_widget.ts index e1f4702d948..3e19044b8f7 100644 --- a/tools/slintpad/src/welcome_widget.ts +++ b/tools/slintpad/src/welcome_widget.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore lumino diff --git a/tools/slintpad/src/worker/lsp_worker.ts b/tools/slintpad/src/worker/lsp_worker.ts index 3a17ccbfb3c..740674a9050 100644 --- a/tools/slintpad/src/worker/lsp_worker.ts +++ b/tools/slintpad/src/worker/lsp_worker.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 import slint_init, * as slint_lsp from "@lsp/slint_lsp_wasm.js"; import { InitializeParams, InitializeResult } from "vscode-languageserver"; diff --git a/tools/slintpad/src/worker/monaco_worker.mjs b/tools/slintpad/src/worker/monaco_worker.mjs index b2724e8190b..a7e9fc36cc1 100644 --- a/tools/slintpad/src/worker/monaco_worker.mjs +++ b/tools/slintpad/src/worker/monaco_worker.mjs @@ -1,4 +1,8 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 export * from "monaco-editor/esm/vs/editor/editor.worker.js"; diff --git a/tools/slintpad/src/worker/types.ts b/tools/slintpad/src/worker/types.ts index 04eaed4d902..73fcd036af3 100644 --- a/tools/slintpad/src/worker/types.ts +++ b/tools/slintpad/src/worker/types.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 /* eslint-disable */ type Document = any; // This type is defined in the `dom` library, which is not compatible with `webworker` diff --git a/tools/slintpad/vite.config.ts b/tools/slintpad/vite.config.ts index 16f653ff8a6..1ef24a2be98 100644 --- a/tools/slintpad/vite.config.ts +++ b/tools/slintpad/vite.config.ts @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore lumino diff --git a/tools/tr-extractor/Cargo.toml b/tools/tr-extractor/Cargo.toml index 0e124807335..08bd1865ca9 100644 --- a/tools/tr-extractor/Cargo.toml +++ b/tools/tr-extractor/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "slint-tr-extractor" diff --git a/tools/tr-extractor/README.md b/tools/tr-extractor/README.md index 417df9e94f2..151765f15ba 100644 --- a/tools/tr-extractor/README.md +++ b/tools/tr-extractor/README.md @@ -1,3 +1,7 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 This utility extract `@tr` strings in a Slint file and generate a `.po` file \ No newline at end of file diff --git a/tools/tr-extractor/main.rs b/tools/tr-extractor/main.rs index 508b80dd357..6bf1c85bb5b 100644 --- a/tools/tr-extractor/main.rs +++ b/tools/tr-extractor/main.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use clap::Parser; use i_slint_compiler::diagnostics::{BuildDiagnostics, Spanned}; diff --git a/tools/updater/Cargo.toml b/tools/updater/Cargo.toml index c044c71aa87..33844c9873d 100644 --- a/tools/updater/Cargo.toml +++ b/tools/updater/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "slint-updater" diff --git a/tools/updater/README.md b/tools/updater/README.md index 20591649332..90d4d106767 100644 --- a/tools/updater/README.md +++ b/tools/updater/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Slint Updater diff --git a/tools/updater/experiments/geometry_changes.rs b/tools/updater/experiments/geometry_changes.rs index e37acc70d1c..15c3a744704 100644 --- a/tools/updater/experiments/geometry_changes.rs +++ b/tools/updater/experiments/geometry_changes.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::Cli; use i_slint_compiler::expression_tree::Expression; diff --git a/tools/updater/experiments/input_output_properties.rs b/tools/updater/experiments/input_output_properties.rs index aea8bfccedb..9c08f382555 100644 --- a/tools/updater/experiments/input_output_properties.rs +++ b/tools/updater/experiments/input_output_properties.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::Cli; use i_slint_compiler::parser::{SyntaxKind, SyntaxNode}; diff --git a/tools/updater/experiments/lookup_changes.rs b/tools/updater/experiments/lookup_changes.rs index 5b6a17bf147..b433821507e 100644 --- a/tools/updater/experiments/lookup_changes.rs +++ b/tools/updater/experiments/lookup_changes.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::Cli; use by_address::ByAddress; diff --git a/tools/updater/experiments/new_component_declaration.rs b/tools/updater/experiments/new_component_declaration.rs index 1977a7cb8fb..fb013de7e30 100644 --- a/tools/updater/experiments/new_component_declaration.rs +++ b/tools/updater/experiments/new_component_declaration.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::Cli; use i_slint_compiler::parser::{SyntaxKind, SyntaxNode}; diff --git a/tools/updater/experiments/purity.rs b/tools/updater/experiments/purity.rs index e26bb1394a7..26ef9a4ee35 100644 --- a/tools/updater/experiments/purity.rs +++ b/tools/updater/experiments/purity.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::Cli; use i_slint_compiler::langtype::Type; diff --git a/tools/updater/experiments/transitions.rs b/tools/updater/experiments/transitions.rs index d478e3f5967..822ae6d0291 100644 --- a/tools/updater/experiments/transitions.rs +++ b/tools/updater/experiments/transitions.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::Cli; use i_slint_compiler::parser::{syntax_nodes, SyntaxKind, SyntaxNode}; diff --git a/tools/updater/main.rs b/tools/updater/main.rs index 97ff601e041..da0df118b5c 100644 --- a/tools/updater/main.rs +++ b/tools/updater/main.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 //! //! Tool to change the syntax or reformat a .slint file diff --git a/tools/updater/transforms/renames.rs b/tools/updater/transforms/renames.rs index f0cb44ebc38..b2e56e70bd5 100644 --- a/tools/updater/transforms/renames.rs +++ b/tools/updater/transforms/renames.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use crate::Cli; use i_slint_compiler::parser::{SyntaxKind, SyntaxNode}; diff --git a/tools/viewer/Cargo.toml b/tools/viewer/Cargo.toml index c6c553fc4f8..4802a28a2d4 100644 --- a/tools/viewer/Cargo.toml +++ b/tools/viewer/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "slint-viewer" diff --git a/tools/viewer/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md b/tools/viewer/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md new file mode 120000 index 00000000000..4225e094c5d --- /dev/null +++ b/tools/viewer/LICENSES/LicenseRef-Slint-Royalty-free-1.2.md @@ -0,0 +1 @@ +../../../LICENSES/LicenseRef-Slint-Royalty-free-1.2.md \ No newline at end of file diff --git a/tools/viewer/README.md b/tools/viewer/README.md index a6a3cdc8789..aea2ba1edd2 100644 --- a/tools/viewer/README.md +++ b/tools/viewer/README.md @@ -1,4 +1,8 @@ +<<<<<<< HEAD + +======= +>>>>>>> 303633443647db52f33842b9707e25e3067db232 # Viewer for Slint diff --git a/tools/viewer/main.rs b/tools/viewer/main.rs index 556f08e0ee5..801087bfc28 100644 --- a/tools/viewer/main.rs +++ b/tools/viewer/main.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 #![doc = include_str!("README.md")] diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index a85ae3449db..e687390ed2c 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -1,5 +1,9 @@ # Copyright © SixtyFPS GmbH +<<<<<<< HEAD +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 [package] name = "xtask" diff --git a/xtask/src/cppdocs.rs b/xtask/src/cppdocs.rs index d741acc971b..beae2aa284a 100644 --- a/xtask/src/cppdocs.rs +++ b/xtask/src/cppdocs.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cspell:ignore cppdocs pipenv pipfile diff --git a/xtask/src/license_headers_check.rs b/xtask/src/license_headers_check.rs index cfcf0b5f3b1..e18dd9f885d 100644 --- a/xtask/src/license_headers_check.rs +++ b/xtask/src/license_headers_check.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cSpell: ignore datetime dotdot gettext @@ -510,7 +514,11 @@ lazy_static! { } const TRIPLE_LICENSE: &str = +<<<<<<< HEAD + "GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial"; +======= "GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial"; +>>>>>>> 303633443647db52f33842b9707e25e3067db232 const MIT_LICENSE: &str = "MIT"; const MIT_OR_APACHE2_LICENSE: &str = "MIT OR Apache-2.0"; @@ -545,7 +553,11 @@ impl<'a> LicenseHeader<'a> { #[cfg(test)] const EXPECTED_SPDX_EXPRESSION: &str = +<<<<<<< HEAD + "GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial"; +======= "GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial"; +>>>>>>> 303633443647db52f33842b9707e25e3067db232 const SPDX_LICENSE_ID: &str = const_format::concatcp!("SP", "DX-License-Identifier:"); // Do not confuse the reuse tool const SPDX_LICENSE_LINE: &str = const_format::concatcp!(SPDX_LICENSE_ID, " "); // Do not confuse the reuse tool diff --git a/xtask/src/main.rs b/xtask/src/main.rs index cd26e5a32c2..2622de3cb76 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use anyhow::Context; use clap::Parser; diff --git a/xtask/src/nodepackage.rs b/xtask/src/nodepackage.rs index 810b5bf9938..dbdbead918b 100644 --- a/xtask/src/nodepackage.rs +++ b/xtask/src/nodepackage.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use anyhow::Context; use xshell::{cmd, Shell}; diff --git a/xtask/src/reuse_compliance_check.rs b/xtask/src/reuse_compliance_check.rs index 18674dcc07a..11d89a718e8 100644 --- a/xtask/src/reuse_compliance_check.rs +++ b/xtask/src/reuse_compliance_check.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 use anyhow::{Context, Result}; diff --git a/xtask/src/slintdocs.rs b/xtask/src/slintdocs.rs index 422c2b95976..d6f4930884e 100644 --- a/xtask/src/slintdocs.rs +++ b/xtask/src/slintdocs.rs @@ -1,5 +1,9 @@ // Copyright © SixtyFPS GmbH +<<<<<<< HEAD +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.2 OR LicenseRef-Slint-commercial +======= // SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free OR LicenseRef-Slint-commercial +>>>>>>> 303633443647db52f33842b9707e25e3067db232 // cspell:ignore slintdocs pipenv pipfile