diff --git a/.cargo/config b/.cargo/config index 964fbb617e1..b17790a9007 100644 --- a/.cargo/config +++ b/.cargo/config @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial [alias] xtask = "run --package xtask --" diff --git a/.github/workflows/build_docs.yaml b/.github/workflows/build_docs.yaml index 2dac6856111..a29bb8d9f0e 100644 --- a/.github/workflows/build_docs.yaml +++ b/.github/workflows/build_docs.yaml @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial # 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 95400affb7c..ad8e3a48158 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial name: CI diff --git a/.github/workflows/cpp_package.yaml b/.github/workflows/cpp_package.yaml index d69344b4a63..bd427b5cce9 100644 --- a/.github/workflows/cpp_package.yaml +++ b/.github/workflows/cpp_package.yaml @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial name: Build the C++ binary package diff --git a/.github/workflows/crater.yaml b/.github/workflows/crater.yaml index d830c79ec98..3d5a7eb67bd 100644 --- a/.github/workflows/crater.yaml +++ b/.github/workflows/crater.yaml @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial # 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 e0f7273f195..d7d8f348e8b 100644 --- a/.github/workflows/embedded_build.yaml +++ b/.github/workflows/embedded_build.yaml @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial name: Embedded Build diff --git a/.github/workflows/nightly_snapshot.yaml b/.github/workflows/nightly_snapshot.yaml index 6d15be7dc70..d35abbf7eeb 100644 --- a/.github/workflows/nightly_snapshot.yaml +++ b/.github/workflows/nightly_snapshot.yaml @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial # Build various demo binaries, c++ packages and documentation and publish them on the website name: Nightly snapshot diff --git a/.github/workflows/slint_tool_binary.yaml b/.github/workflows/slint_tool_binary.yaml index 1816db9ea4e..d24046d4b3a 100644 --- a/.github/workflows/slint_tool_binary.yaml +++ b/.github/workflows/slint_tool_binary.yaml @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial name: Build slint-viewer or -lsp binary diff --git a/.github/workflows/spellcheck.yaml b/.github/workflows/spellcheck.yaml index 83e4f318b6d..7769f6069fa 100644 --- a/.github/workflows/spellcheck.yaml +++ b/.github/workflows/spellcheck.yaml @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial name: 'Check spelling' on: diff --git a/.github/workflows/upgrade_version.yaml b/.github/workflows/upgrade_version.yaml index 41c615d8b7e..0c362d50b21 100644 --- a/.github/workflows/upgrade_version.yaml +++ b/.github/workflows/upgrade_version.yaml @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial name: Upgrade Version Number diff --git a/.github/workflows/wasm_demos.yaml b/.github/workflows/wasm_demos.yaml index 162dbf7d52d..d4d767091ca 100644 --- a/.github/workflows/wasm_demos.yaml +++ b/.github/workflows/wasm_demos.yaml @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial name: Build wasm demos diff --git a/.github/workflows/wasm_editor_and_interpreter.yaml b/.github/workflows/wasm_editor_and_interpreter.yaml index a5312437cd1..78db2d7ab8f 100644 --- a/.github/workflows/wasm_editor_and_interpreter.yaml +++ b/.github/workflows/wasm_editor_and_interpreter.yaml @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial name: Build the web editor and the interpreter wasm module diff --git a/.reuse/dep5 b/.reuse/dep5 index 56ad70c140e..9d614b510dc 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -4,28 +4,28 @@ Upstream-Contact: Slint Developers Source: https://slint-ui.com/ Files: */slint-logo-*.svg */slint-logo-*.png -Copyright: Copyright © SixtyFPS GmbH +Copyright: Copyright © SixtyFPS GmbH License: CC-BY-ND-4.0 Files: .clang-format .gitattributes .gitignore */.gitignore .pre-commit-config.yaml .vscode/* cspell.json rustfmt.toml -Copyright: Copyright © SixtyFPS GmbH -License: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +Copyright: Copyright © SixtyFPS GmbH +License: GPL-3.0-only OR LicenseRef-Slint-commercial Files: CHANGELOG.md CONTRIBUTING.md FAQ.md README.md */CHANGELOG.md */README.md -Copyright: Copyright © SixtyFPS GmbH -License: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +Copyright: Copyright © SixtyFPS GmbH +License: GPL-3.0-only OR LicenseRef-Slint-commercial Files: helper_crates/const_field_offset/* -Copyright: Copyright © SixtyFPS GmbH +Copyright: Copyright © SixtyFPS GmbH License: MIT or APACHE-2.0 Files: api/cpp/docs/* docs/* api/*/*.json api/rs/slint/migration.md -Copyright: Copyright © SixtyFPS GmbH -License: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +Copyright: Copyright © SixtyFPS GmbH +License: GPL-3.0-only OR LicenseRef-Slint-commercial Files: examples/README.md examples/*/README.md examples/*.json examples/*/README examples/*/README.txt examples/qt_viewer/interface.ui -Copyright: Copyright © SixtyFPS GmbH -License: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +Copyright: Copyright © SixtyFPS GmbH +License: GPL-3.0-only OR LicenseRef-Slint-commercial Files: examples/memory/icons/*.svg examples/memory/icons/*.png Copyright: Fontawesome project @@ -44,13 +44,13 @@ Copyright: The Qt Company License: LGPL-3.0-only Files: tools/lsp/sublime/LSP.sublime-settings -Copyright: Copyright © SixtyFPS GmbH -License: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +Copyright: Copyright © SixtyFPS GmbH +License: GPL-3.0-only OR LicenseRef-Slint-commercial Files: tools/online_editor/*.html tools/online_editor/*.json -Copyright: Copyright © SixtyFPS GmbH -License: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +Copyright: Copyright © SixtyFPS GmbH +License: GPL-3.0-only OR LicenseRef-Slint-commercial Files: vscode_extension/*.json vscode_extension/README.md -Copyright: Copyright © SixtyFPS GmbH -License: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +Copyright: Copyright © SixtyFPS GmbH +License: GPL-3.0-only OR LicenseRef-Slint-commercial diff --git a/CMakeLists.txt b/CMakeLists.txt index 21ebdc03c48..1761006448f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial cmake_minimum_required(VERSION 3.19) diff --git a/Cargo.toml b/Cargo.toml index 165b129e2ba..1842c3684e4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial [workspace] members = [ diff --git a/Cross.toml b/Cross.toml index d737a93b36a..e8ab48c930a 100644 --- a/Cross.toml +++ b/Cross.toml @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial [target.aarch64-unknown-linux-gnu] image = "ghcr.io/slint-ui/slint/aarch64-unknown-linux-gnu" diff --git a/LICENSE.md b/LICENSE.md index c1e34981f11..1da1261559a 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # Slint License -Slint is available under either a [commercial license](LICENSES/LicenseRef-SixtyFPS-commercial.md) +Slint is available under either a [commercial license](LICENSES/LicenseRef-Slint-commercial.md) or at your choice under [GPL 3.0](LICENSES/GPL-3.0-only.txt). Third party licenses listed in the `LICENSES` folder also apply to parts of the product. diff --git a/LICENSES/CC-PDDC.txt b/LICENSES/CC-PDDC.txt new file mode 100644 index 00000000000..b64dfd6b700 --- /dev/null +++ b/LICENSES/CC-PDDC.txt @@ -0,0 +1,8 @@ + +The person or persons who have associated work with this document (the "Dedicator" or "Certifier") hereby either (a) certifies that, to the best of his knowledge, the work of authorship identified is in the public domain of the country from which the work is published, or (b) hereby dedicates whatever copyright the dedicators holds in the work of authorship identified below (the "Work") to the public domain. A certifier, moreover, dedicates any copyright interest he may have in the associated work, and for these purposes, is described as a "dedicator" below. + +A certifier has taken reasonable steps to verify the copyright status of this work. Certifier recognizes that his good faith efforts may not shield him from liability if in fact the work certified is not in the public domain. + +Dedicator makes this dedication for the benefit of the public at large and to the detriment of the Dedicator's heirs and successors. Dedicator intends this dedication to be an overt act of relinquishment in perpetuity of all present and future rights under copyright law, whether vested or contingent, in the Work. Dedicator understands that such relinquishment of all rights includes the relinquishment of all rights to enforce (by lawsuit or otherwise) those copyrights in the Work. + +Dedicator recognizes that, once placed in the public domain, the Work may be freely reproduced, distributed, transmitted, used, modified, built upon, or otherwise exploited by anyone for any purpose, commercial or non-commercial, and in any way, including by methods that have not yet been invented or conceived. diff --git a/LICENSES/LicenseRef-SixtyFPS-commercial.md b/LICENSES/LicenseRef-SixtyFPS-commercial.md deleted file mode 100644 index 0793fffeffd..00000000000 --- a/LICENSES/LicenseRef-SixtyFPS-commercial.md +++ /dev/null @@ -1,9 +0,0 @@ -# License - -This project is available under two different licenses: - -## The SixtyFPS Commercial License - -We plan to offer under a commercial license. This is working progress, please contact info@sixtyfps.io if you're interested. - -See also the [Licensing FAQ](FAQ.md#licensing) diff --git a/LICENSES/LicenseRef-Slint-commercial.md b/LICENSES/LicenseRef-Slint-commercial.md new file mode 100644 index 00000000000..06b0a3b9871 --- /dev/null +++ b/LICENSES/LicenseRef-Slint-commercial.md @@ -0,0 +1,5 @@ +## The Slint Commercial License + +Slint is offered under a commercial license. Please contact info@slint-ui.com if you're interested. + +See also the [Licensing FAQ](FAQ.md#licensing) diff --git a/api/cpp/CMakeLists.txt b/api/cpp/CMakeLists.txt index 6d678ab0e59..a12a0385285 100644 --- a/api/cpp/CMakeLists.txt +++ b/api/cpp/CMakeLists.txt @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial cmake_minimum_required(VERSION 3.19) project(Slint HOMEPAGE_URL "https://slint-ui.com/" LANGUAGES CXX) diff --git a/api/cpp/Cargo.toml b/api/cpp/Cargo.toml index 9f826a9cfd3..c6fd4171a2e 100644 --- a/api/cpp/Cargo.toml +++ b/api/cpp/Cargo.toml @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial [package] name = "slint-cpp" @@ -7,7 +7,7 @@ version = "0.2.0" authors = ["Slint Developers "] edition = "2021" build = "build.rs" -license = "(GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)" +license = "GPL-3.0-only OR LicenseRef-Slint-commercial" description = "Slint C++ integration" repository = "https://github.com/slint-ui/slint" homepage = "https://slint-ui.com" diff --git a/api/cpp/build.rs b/api/cpp/build.rs index 4342b6496ab..b99c36f6062 100644 --- a/api/cpp/build.rs +++ b/api/cpp/build.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial use std::path::Path; mod cbindgen; diff --git a/api/cpp/cbindgen.rs b/api/cpp/cbindgen.rs index 593d32a7dc1..0f834a2b8c8 100644 --- a/api/cpp/cbindgen.rs +++ b/api/cpp/cbindgen.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial use anyhow::Context; use std::iter::Extend; diff --git a/api/cpp/cmake/SlintConfig.cmake.in b/api/cpp/cmake/SlintConfig.cmake.in index 2ed22a2f571..1c68923cceb 100644 --- a/api/cpp/cmake/SlintConfig.cmake.in +++ b/api/cpp/cmake/SlintConfig.cmake.in @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial @PACKAGE_INIT@ diff --git a/api/cpp/cmake/SlintMacro.cmake b/api/cpp/cmake/SlintMacro.cmake index b12fdc30eae..6aa3aedf5b6 100644 --- a/api/cpp/cmake/SlintMacro.cmake +++ b/api/cpp/cmake/SlintMacro.cmake @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial function(SLINT_TARGET_SOURCES target) foreach (it IN ITEMS ${ARGN}) diff --git a/api/cpp/docs/.gitignore b/api/cpp/docs/.gitignore index 2b2c2f00ba4..af6d8af7c11 100644 --- a/api/cpp/docs/.gitignore +++ b/api/cpp/docs/.gitignore @@ -1,4 +1,4 @@ -# Copyright © 2021 SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © 2021 SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial Pipfile.lock diff --git a/api/cpp/docs/Pipfile b/api/cpp/docs/Pipfile index 6c5170f27e5..0f03ebb9497 100644 --- a/api/cpp/docs/Pipfile +++ b/api/cpp/docs/Pipfile @@ -1,5 +1,5 @@ -# Copyright © 2021 SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © 2021 SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial [[source]] name = "pypi" diff --git a/api/cpp/docs/conf.py b/api/cpp/docs/conf.py index f598fbcdc00..fafb8278b7c 100644 --- a/api/cpp/docs/conf.py +++ b/api/cpp/docs/conf.py @@ -1,5 +1,5 @@ -# Copyright © 2021 SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © 2021 SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial # Configuration file for the Sphinx documentation builder. # diff --git a/api/cpp/docs/genindex.rst b/api/cpp/docs/genindex.rst index 85f010caaab..b9cc7319a0d 100644 --- a/api/cpp/docs/genindex.rst +++ b/api/cpp/docs/genindex.rst @@ -1,5 +1,5 @@ -.. Copyright © SixtyFPS GmbH -.. SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +.. Copyright © SixtyFPS GmbH +.. SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial =========== Index (C++) diff --git a/api/cpp/docs/index.rst b/api/cpp/docs/index.rst index 1f9d83fda6d..f6b62b4ece2 100644 --- a/api/cpp/docs/index.rst +++ b/api/cpp/docs/index.rst @@ -1,5 +1,5 @@ -.. Copyright © SixtyFPS GmbH -.. SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +.. Copyright © SixtyFPS GmbH +.. SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial .. Slint C++ documentation master file diff --git a/api/cpp/docs/language.rst b/api/cpp/docs/language.rst index 70adaec48a7..74d77d29f51 100644 --- a/api/cpp/docs/language.rst +++ b/api/cpp/docs/language.rst @@ -1,5 +1,5 @@ -.. Copyright © SixtyFPS GmbH -.. SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +.. Copyright © SixtyFPS GmbH +.. SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial The .slint UI Design Language ========================== diff --git a/api/cpp/include/slint.h b/api/cpp/include/slint.h index b5557908e45..a4dfcc045f6 100644 --- a/api/cpp/include/slint.h +++ b/api/cpp/include/slint.h @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #pragma once diff --git a/api/cpp/include/slint_brush.h b/api/cpp/include/slint_brush.h index 7c13862b223..58bdfa86e4e 100644 --- a/api/cpp/include/slint_brush.h +++ b/api/cpp/include/slint_brush.h @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #pragma once #include diff --git a/api/cpp/include/slint_callbacks.h b/api/cpp/include/slint_callbacks.h index 8a3984997d7..b2a490fd142 100644 --- a/api/cpp/include/slint_callbacks.h +++ b/api/cpp/include/slint_callbacks.h @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #pragma once #include diff --git a/api/cpp/include/slint_color.h b/api/cpp/include/slint_color.h index 5a340aab1f7..2aaff4be278 100644 --- a/api/cpp/include/slint_color.h +++ b/api/cpp/include/slint_color.h @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #pragma once diff --git a/api/cpp/include/slint_config.h b/api/cpp/include/slint_config.h index 272d44aac99..ff7c43c3355 100644 --- a/api/cpp/include/slint_config.h +++ b/api/cpp/include/slint_config.h @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #pragma once diff --git a/api/cpp/include/slint_image.h b/api/cpp/include/slint_image.h index ed90835c304..6d5e056797d 100644 --- a/api/cpp/include/slint_image.h +++ b/api/cpp/include/slint_image.h @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #pragma once #include diff --git a/api/cpp/include/slint_interpreter.h b/api/cpp/include/slint_interpreter.h index 53faa12e484..a70fde9f01e 100644 --- a/api/cpp/include/slint_interpreter.h +++ b/api/cpp/include/slint_interpreter.h @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #pragma once diff --git a/api/cpp/include/slint_pathdata.h b/api/cpp/include/slint_pathdata.h index 6243ee4c4f5..9a0b6026487 100644 --- a/api/cpp/include/slint_pathdata.h +++ b/api/cpp/include/slint_pathdata.h @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #pragma once #include diff --git a/api/cpp/include/slint_properties.h b/api/cpp/include/slint_properties.h index fa0a390961b..0361a58273a 100644 --- a/api/cpp/include/slint_properties.h +++ b/api/cpp/include/slint_properties.h @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #pragma once #include diff --git a/api/cpp/include/slint_sharedvector.h b/api/cpp/include/slint_sharedvector.h index 5476a8a2624..98a9d1a1143 100644 --- a/api/cpp/include/slint_sharedvector.h +++ b/api/cpp/include/slint_sharedvector.h @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #pragma once #include "slint_sharedvector_internal.h" diff --git a/api/cpp/include/slint_size.h b/api/cpp/include/slint_size.h index 151550edb82..6e5143cc4cc 100644 --- a/api/cpp/include/slint_size.h +++ b/api/cpp/include/slint_size.h @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #pragma once diff --git a/api/cpp/include/slint_string.h b/api/cpp/include/slint_string.h index f6c9bcda902..076bb8589d3 100644 --- a/api/cpp/include/slint_string.h +++ b/api/cpp/include/slint_string.h @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #pragma once #include diff --git a/api/cpp/include/slint_testing.h b/api/cpp/include/slint_testing.h index 2a8b7349d14..8282b90bf7c 100644 --- a/api/cpp/include/slint_testing.h +++ b/api/cpp/include/slint_testing.h @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #pragma once #include "slint.h" diff --git a/api/cpp/include/vtable.h b/api/cpp/include/vtable.h index b70ccb2c6ec..41f9b5ba1f2 100644 --- a/api/cpp/include/vtable.h +++ b/api/cpp/include/vtable.h @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #pragma once diff --git a/api/cpp/lib.rs b/api/cpp/lib.rs index 9ff2d724cf2..d9444b6cb36 100644 --- a/api/cpp/lib.rs +++ b/api/cpp/lib.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial /*! This crate just expose the function used by the C++ integration */ diff --git a/api/cpp/tests/datastructures.cpp b/api/cpp/tests/datastructures.cpp index 641b6f3a7be..986ef7e2c42 100644 --- a/api/cpp/tests/datastructures.cpp +++ b/api/cpp/tests/datastructures.cpp @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #include #define CATCH_CONFIG_MAIN diff --git a/api/cpp/tests/eventloop.cpp b/api/cpp/tests/eventloop.cpp index 3285096254b..ba166334ff2 100644 --- a/api/cpp/tests/eventloop.cpp +++ b/api/cpp/tests/eventloop.cpp @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #define CATCH_CONFIG_MAIN #include "catch2/catch.hpp" diff --git a/api/cpp/tests/interpreter.cpp b/api/cpp/tests/interpreter.cpp index ea385e78ea9..b2f0d0453d4 100644 --- a/api/cpp/tests/interpreter.cpp +++ b/api/cpp/tests/interpreter.cpp @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #define CATCH_CONFIG_MAIN #include "catch2/catch.hpp" diff --git a/api/cpp/tests/test.slint b/api/cpp/tests/test.slint index 0fb45803a54..e90fac1b6f8 100644 --- a/api/cpp/tests/test.slint +++ b/api/cpp/tests/test.slint @@ -1,4 +1,4 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial export Test := Rectangle {} diff --git a/api/node/lib/index.ts b/api/node/lib/index.ts index 569593e7076..cd2e32cdca8 100644 --- a/api/node/lib/index.ts +++ b/api/node/lib/index.ts @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial // Load the native library with `process.dlopen` instead of with `require`. // This is only done for autotest that do not require nom or neon_cli to diff --git a/api/node/loader.mjs b/api/node/loader.mjs index de90a603a9d..c1dd10101f7 100644 --- a/api/node/loader.mjs +++ b/api/node/loader.mjs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial import { URL, pathToFileURL } from 'url'; diff --git a/api/node/native/Cargo.toml b/api/node/native/Cargo.toml index 594c1a52a12..8b695f5b8a2 100644 --- a/api/node/native/Cargo.toml +++ b/api/node/native/Cargo.toml @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial [package] name = "slint-node" @@ -9,7 +9,7 @@ edition = "2021" build = "build.rs" # This is not meant to be used as a library from crate.io publish = false -license = "(GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)" +license = "GPL-3.0-only OR LicenseRef-Slint-commercial" repository = "https://github.com/slint-ui/slint" homepage = "https://slint-ui.com" diff --git a/api/node/native/build.rs b/api/node/native/build.rs index 2ccc570ed1d..f5f9b7c590c 100644 --- a/api/node/native/build.rs +++ b/api/node/native/build.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial fn main() { neon_build::setup(); diff --git a/api/node/native/js_model.rs b/api/node/native/js_model.rs index 4e74e99e2ed..333c2a57b7f 100644 --- a/api/node/native/js_model.rs +++ b/api/node/native/js_model.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial use i_slint_compiler::langtype::Type; use i_slint_core::model::Model; diff --git a/api/node/native/lib.rs b/api/node/native/lib.rs index 2646febb7fb..fe0c7bcf167 100644 --- a/api/node/native/lib.rs +++ b/api/node/native/lib.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial use core::cell::RefCell; use i_slint_compiler::langtype::Type; diff --git a/api/node/native/persistent_context.rs b/api/node/native/persistent_context.rs index 6b83ab72f9c..6b8d2f818b3 100644 --- a/api/node/native/persistent_context.rs +++ b/api/node/native/persistent_context.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial /*! Since neon does not allow to have a persistent handle, use this hack. diff --git a/api/rs/build/Cargo.toml b/api/rs/build/Cargo.toml index c15f4919320..f3ebf24c240 100644 --- a/api/rs/build/Cargo.toml +++ b/api/rs/build/Cargo.toml @@ -1,12 +1,12 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial [package] name = "slint-build" version = "0.2.0" authors = ["Slint Developers "] edition = "2021" -license = "(GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)" +license = "GPL-3.0-only OR LicenseRef-Slint-commercial" description = "Helper for Slint build script" repository = "https://github.com/slint-ui/slint" homepage = "https://slint-ui.com" diff --git a/api/rs/build/lib.rs b/api/rs/build/lib.rs index 4ee25774124..17c3949011a 100644 --- a/api/rs/build/lib.rs +++ b/api/rs/build/lib.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial /*! 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 08f966a4ab6..4c57a742ed7 100644 --- a/api/rs/macros/Cargo.toml +++ b/api/rs/macros/Cargo.toml @@ -1,12 +1,12 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial [package] name = "slint-macros" version = "0.2.0" authors = ["Slint Developers "] edition = "2021" -license = "(GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)" +license = "GPL-3.0-only OR LicenseRef-Slint-commercial" description = "Macro helper for slint crate" repository = "https://github.com/slint-ui/slint" homepage = "https://slint-ui.com" diff --git a/api/rs/macros/lib.rs b/api/rs/macros/lib.rs index 85f40474ed2..375c132b484 100644 --- a/api/rs/macros/lib.rs +++ b/api/rs/macros/lib.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial // cSpell:ignore punct diff --git a/api/rs/slint/Cargo.toml b/api/rs/slint/Cargo.toml index 887ff6e44ce..2efde506847 100644 --- a/api/rs/slint/Cargo.toml +++ b/api/rs/slint/Cargo.toml @@ -1,12 +1,12 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial [package] name = "slint" version = "0.2.0" authors = ["Slint Developers "] edition = "2021" -license = "(GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)" +license = "GPL-3.0-only OR LicenseRef-Slint-commercial" description = "Slint Rust API" repository = "https://github.com/slint-ui/slint" homepage = "https://slint-ui.com" diff --git a/api/rs/slint/compile_fail_tests.rs b/api/rs/slint/compile_fail_tests.rs index 50b217801fe..006c66a383c 100644 --- a/api/rs/slint/compile_fail_tests.rs +++ b/api/rs/slint/compile_fail_tests.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial /** Test that the tokenizer properly rejects tokens with spaces. diff --git a/api/rs/slint/docs.rs b/api/rs/slint/docs.rs index d7bff51b5c3..8d6684457d4 100644 --- a/api/rs/slint/docs.rs +++ b/api/rs/slint/docs.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #![cfg(doc)] /*! diff --git a/api/rs/slint/lib.rs b/api/rs/slint/lib.rs index a30b177f9b6..04e84f6bbd7 100644 --- a/api/rs/slint/lib.rs +++ b/api/rs/slint/lib.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial /*! # Slint diff --git a/api/rs/slint/tests/simple_macro.rs b/api/rs/slint/tests/simple_macro.rs index bde911a57c9..853508c1733 100644 --- a/api/rs/slint/tests/simple_macro.rs +++ b/api/rs/slint/tests/simple_macro.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial use ::slint::slint; diff --git a/api/wasm-interpreter/Cargo.toml b/api/wasm-interpreter/Cargo.toml index a1d5e60b320..659152e487f 100644 --- a/api/wasm-interpreter/Cargo.toml +++ b/api/wasm-interpreter/Cargo.toml @@ -1,12 +1,12 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial [package] name = "slint-wasm-interpreter" version = "0.2.0" authors = ["Slint Developers "] edition = "2021" -license = "(GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)" +license = "GPL-3.0-only OR LicenseRef-Slint-commercial" publish = false description = "Slint wasm glue" repository = "https://github.com/slint-ui/slint" diff --git a/api/wasm-interpreter/src/lib.rs b/api/wasm-interpreter/src/lib.rs index 5235435720f..a6a37ab8a3b 100644 --- a/api/wasm-interpreter/src/lib.rs +++ b/api/wasm-interpreter/src/lib.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial //! 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 135151057de..abdce906438 100644 --- a/cmake/FindOpenGLES2.cmake +++ b/cmake/FindOpenGLES2.cmake @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial include(CheckCXXSourceCompiles) diff --git a/docker/Dockerfile.aarch64-unknown-linux-gnu b/docker/Dockerfile.aarch64-unknown-linux-gnu index a6cb55a8ca9..0c37b70e8a7 100644 --- a/docker/Dockerfile.aarch64-unknown-linux-gnu +++ b/docker/Dockerfile.aarch64-unknown-linux-gnu @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial 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 8a7d60bde9a..fbf2018732f 100644 --- a/docker/Dockerfile.armv7-unknown-linux-gnueabihf +++ b/docker/Dockerfile.armv7-unknown-linux-gnueabihf @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial FROM rustembedded/cross:armv7-unknown-linux-gnueabihf-0.2.1 diff --git a/docker/Dockerfile.riscv64gc-unknown-linux-gnu b/docker/Dockerfile.riscv64gc-unknown-linux-gnu index 1e8f99776cb..470a937b575 100644 --- a/docker/Dockerfile.riscv64gc-unknown-linux-gnu +++ b/docker/Dockerfile.riscv64gc-unknown-linux-gnu @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial # 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/docs/tutorial/cpp/src/CMakeLists.txt b/docs/tutorial/cpp/src/CMakeLists.txt index 1bfd969918d..306c2abfed3 100644 --- a/docs/tutorial/cpp/src/CMakeLists.txt +++ b/docs/tutorial/cpp/src/CMakeLists.txt @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial cmake_minimum_required(VERSION 3.14) diff --git a/docs/tutorial/cpp/src/main_game_logic.cpp b/docs/tutorial/cpp/src/main_game_logic.cpp index dd4560e9848..fcdab5b4815 100644 --- a/docs/tutorial/cpp/src/main_game_logic.cpp +++ b/docs/tutorial/cpp/src/main_game_logic.cpp @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial // clang-format off // main.cpp diff --git a/docs/tutorial/cpp/src/main_initial.cpp b/docs/tutorial/cpp/src/main_initial.cpp index 295d96c6cba..ecf7ad61095 100644 --- a/docs/tutorial/cpp/src/main_initial.cpp +++ b/docs/tutorial/cpp/src/main_initial.cpp @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial // ANCHOR: main // main.cpp diff --git a/docs/tutorial/cpp/src/main_tiles_from_cpp.cpp b/docs/tutorial/cpp/src/main_tiles_from_cpp.cpp index 606c806f167..35cf5460dde 100644 --- a/docs/tutorial/cpp/src/main_tiles_from_cpp.cpp +++ b/docs/tutorial/cpp/src/main_tiles_from_cpp.cpp @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial // main.cpp diff --git a/docs/tutorial/cpp/src/memory.slint b/docs/tutorial/cpp/src/memory.slint index 299f09463b6..b11526e2afe 100644 --- a/docs/tutorial/cpp/src/memory.slint +++ b/docs/tutorial/cpp/src/memory.slint @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial // ANCHOR: main_window // memory.slint diff --git a/docs/tutorial/cpp/src/memory_game_logic.slint b/docs/tutorial/cpp/src/memory_game_logic.slint index 9d858b676f4..c6d6e914a88 100644 --- a/docs/tutorial/cpp/src/memory_game_logic.slint +++ b/docs/tutorial/cpp/src/memory_game_logic.slint @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial struct TileData := { image: image, diff --git a/docs/tutorial/cpp/src/memory_tile.slint b/docs/tutorial/cpp/src/memory_tile.slint index 7a5e1d707c3..d049eeeaed2 100644 --- a/docs/tutorial/cpp/src/memory_tile.slint +++ b/docs/tutorial/cpp/src/memory_tile.slint @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial // ANCHOR: main_window MemoryTile := Rectangle { diff --git a/docs/tutorial/cpp/src/memory_tiles_from_cpp.slint b/docs/tutorial/cpp/src/memory_tiles_from_cpp.slint index b93eb6b9762..2c6c31597bb 100644 --- a/docs/tutorial/cpp/src/memory_tiles_from_cpp.slint +++ b/docs/tutorial/cpp/src/memory_tiles_from_cpp.slint @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial struct TileData := { image: image, diff --git a/docs/tutorial/rust/src/Cargo.toml b/docs/tutorial/rust/src/Cargo.toml index 6e160c158d0..99c1b834aad 100644 --- a/docs/tutorial/rust/src/Cargo.toml +++ b/docs/tutorial/rust/src/Cargo.toml @@ -1,12 +1,12 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial [package] name = "src" version = "0.2.0" authors = ["Slint Developers "] edition = "2021" -license = "(GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)" +license = "GPL-3.0-only OR LicenseRef-Slint-commercial" description = "Binaries for Rust version of Memory Tutorial of Slint" repository = "https://github.com/slint-ui/slint" homepage = "https://slint-ui.com" diff --git a/docs/tutorial/rust/src/main_game_logic_in_rust.rs b/docs/tutorial/rust/src/main_game_logic_in_rust.rs index 1fa58bab915..a4476ad58de 100644 --- a/docs/tutorial/rust/src/main_game_logic_in_rust.rs +++ b/docs/tutorial/rust/src/main_game_logic_in_rust.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #[allow(dead_code)] fn main() { diff --git a/docs/tutorial/rust/src/main_initial.rs b/docs/tutorial/rust/src/main_initial.rs index 1aa1af71e36..6ac95cbe477 100644 --- a/docs/tutorial/rust/src/main_initial.rs +++ b/docs/tutorial/rust/src/main_initial.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #[allow(dead_code)] // ANCHOR: main diff --git a/docs/tutorial/rust/src/main_memory_tile.rs b/docs/tutorial/rust/src/main_memory_tile.rs index 474e442aaa1..345e1e5b7cb 100644 --- a/docs/tutorial/rust/src/main_memory_tile.rs +++ b/docs/tutorial/rust/src/main_memory_tile.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #[allow(dead_code)] fn main() { diff --git a/docs/tutorial/rust/src/main_multiple_tiles.rs b/docs/tutorial/rust/src/main_multiple_tiles.rs index 391dfc998f8..49bd9124f3a 100644 --- a/docs/tutorial/rust/src/main_multiple_tiles.rs +++ b/docs/tutorial/rust/src/main_multiple_tiles.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #[allow(dead_code)] fn main() { diff --git a/docs/tutorial/rust/src/main_polishing_the_tile.rs b/docs/tutorial/rust/src/main_polishing_the_tile.rs index 0da74d21302..6f1d50fa445 100644 --- a/docs/tutorial/rust/src/main_polishing_the_tile.rs +++ b/docs/tutorial/rust/src/main_polishing_the_tile.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #[allow(dead_code)] fn main() { diff --git a/docs/tutorial/rust/src/main_tiles_from_rust.rs b/docs/tutorial/rust/src/main_tiles_from_rust.rs index 437a485807b..3c2868acd47 100644 --- a/docs/tutorial/rust/src/main_tiles_from_rust.rs +++ b/docs/tutorial/rust/src/main_tiles_from_rust.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #[allow(dead_code)] // ANCHOR: tiles diff --git a/docs/tutorial/theme/highlight.js b/docs/tutorial/theme/highlight.js index 792b3ab112d..4fca1f54e0c 100644 --- a/docs/tutorial/theme/highlight.js +++ b/docs/tutorial/theme/highlight.js @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial // This file is empty to override and disable mdbook's built-in highlight.js // version, which does not include CMake support. Instead the appropriate version diff --git a/examples/7gui/Cargo.toml b/examples/7gui/Cargo.toml index ee780f50017..f0cc6fb51bf 100644 --- a/examples/7gui/Cargo.toml +++ b/examples/7gui/Cargo.toml @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial [package] name = "_7gui" @@ -7,7 +7,7 @@ version = "0.2.0" authors = ["Slint Developers "] edition = "2021" publish = false -license = "(GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)" +license = "GPL-3.0-only OR LicenseRef-Slint-commercial" [[bin]] path = "booker.rs" diff --git a/examples/7gui/booker.rs b/examples/7gui/booker.rs index 9c0f87aad8b..5520f37b2c7 100644 --- a/examples/7gui/booker.rs +++ b/examples/7gui/booker.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial use chrono::NaiveDate; use slint::SharedString; diff --git a/examples/7gui/booker.slint b/examples/7gui/booker.slint index 37237f5916a..b63d73b4f21 100644 --- a/examples/7gui/booker.slint +++ b/examples/7gui/booker.slint @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial import { LineEdit, Button, ComboBox, VerticalBox } from "std-widgets.slint"; diff --git a/examples/7gui/cells.slint b/examples/7gui/cells.slint index a8b4a879f7a..f4880bc323f 100644 --- a/examples/7gui/cells.slint +++ b/examples/7gui/cells.slint @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial import { LineEdit, ScrollView} from "std-widgets.slint"; diff --git a/examples/7gui/circledraw.slint b/examples/7gui/circledraw.slint index 1582b58b4c2..05c107b4768 100644 --- a/examples/7gui/circledraw.slint +++ b/examples/7gui/circledraw.slint @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial import { LineEdit, Button, Slider, StandardListView, VerticalBox } from "std-widgets.slint"; diff --git a/examples/7gui/counter.slint b/examples/7gui/counter.slint index 9541697cc34..7e9ab28be52 100644 --- a/examples/7gui/counter.slint +++ b/examples/7gui/counter.slint @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial import { Button, LineEdit, HorizontalBox } from "std-widgets.slint"; diff --git a/examples/7gui/crud.slint b/examples/7gui/crud.slint index 4cb6567a5de..0a24806764c 100644 --- a/examples/7gui/crud.slint +++ b/examples/7gui/crud.slint @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial import { LineEdit, Button, Slider, StandardListView, GridBox, HorizontalBox } from "std-widgets.slint"; diff --git a/examples/7gui/tempconv.slint b/examples/7gui/tempconv.slint index 8bfc294ec49..bee8a93a46c 100644 --- a/examples/7gui/tempconv.slint +++ b/examples/7gui/tempconv.slint @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial import { LineEdit, HorizontalBox } from "std-widgets.slint"; diff --git a/examples/7gui/timer.slint b/examples/7gui/timer.slint index bf262688aba..c33fa20d5a4 100644 --- a/examples/7gui/timer.slint +++ b/examples/7gui/timer.slint @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial import { LineEdit, Button, Slider, HorizontalBox, VerticalBox } from "std-widgets.slint"; diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index a85e2bd1e74..7db59b8b9cc 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial cmake_minimum_required(VERSION 3.19) project(SlintExamples LANGUAGES CXX) diff --git a/examples/bash/simple_input.sh b/examples/bash/simple_input.sh index b1b8334e94f..1df04591118 100755 --- a/examples/bash/simple_input.sh +++ b/examples/bash/simple_input.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial OUTPUT=$(slint-viewer - --save-data - << EOF import { StandardButton, GridBox, LineEdit } from "std-widgets.slint"; diff --git a/examples/bash/sysinfo.slint b/examples/bash/sysinfo.slint index 8cdcb0bab33..c040ff4bd8d 100644 --- a/examples/bash/sysinfo.slint +++ b/examples/bash/sysinfo.slint @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial import { TabWidget, StandardButton, GridBox, VerticalBox, ListView } from "std-widgets.slint"; @@ -181,4 +181,4 @@ SysInfo := Dialog { } return "\{unit} B"; } -} \ No newline at end of file +} diff --git a/examples/bash/sysinfo_linux.sh b/examples/bash/sysinfo_linux.sh index 135a4ad321c..30fe2fe013e 100755 --- a/examples/bash/sysinfo_linux.sh +++ b/examples/bash/sysinfo_linux.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial if command lsb_release 2>/dev/null >/dev/null; then os_name=`lsb_release -ds | tr -d '"\\\\'` diff --git a/examples/bash/sysinfo_macos.sh b/examples/bash/sysinfo_macos.sh index b733ca8cdbc..fd4d82d29d9 100755 --- a/examples/bash/sysinfo_macos.sh +++ b/examples/bash/sysinfo_macos.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial os_name=`sw_vers -productName` os_version=`sw_vers -productVersion` diff --git a/examples/fancy_demo/main.slint b/examples/fancy_demo/main.slint index cd7b8adb099..7b67376c755 100644 --- a/examples/fancy_demo/main.slint +++ b/examples/fancy_demo/main.slint @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial global Palette := { property window-background: #eee; diff --git a/examples/gallery/CMakeLists.txt b/examples/gallery/CMakeLists.txt index 8eb4a56dafa..9be3c10a0b9 100644 --- a/examples/gallery/CMakeLists.txt +++ b/examples/gallery/CMakeLists.txt @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial cmake_minimum_required(VERSION 3.14) project(slint_cpp_gallery LANGUAGES CXX) diff --git a/examples/gallery/Cargo.toml b/examples/gallery/Cargo.toml index 9777c1e9fd3..4d91b2f2f95 100644 --- a/examples/gallery/Cargo.toml +++ b/examples/gallery/Cargo.toml @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial [package] name = "gallery" @@ -7,7 +7,7 @@ version = "0.2.0" authors = ["Slint Developers "] edition = "2021" build = "build.rs" -license = "(GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)" +license = "GPL-3.0-only OR LicenseRef-Slint-commercial" publish = false [[bin]] diff --git a/examples/gallery/build.rs b/examples/gallery/build.rs index 53c25b120a3..20c1dad1803 100644 --- a/examples/gallery/build.rs +++ b/examples/gallery/build.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial fn main() { slint_build::compile("gallery.slint").unwrap(); diff --git a/examples/gallery/gallery.slint b/examples/gallery/gallery.slint index 39cbd840f5a..edd7cfb8847 100644 --- a/examples/gallery/gallery.slint +++ b/examples/gallery/gallery.slint @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial import { ScrollView, Button, CheckBox, SpinBox, Slider, GroupBox, LineEdit, StandardListView, ComboBox, HorizontalBox, VerticalBox, GridBox, TabWidget, TextEdit, AboutSlint } from "std-widgets.slint"; diff --git a/examples/gallery/index.html b/examples/gallery/index.html index 5165426ea9c..e3f562cf61e 100644 --- a/examples/gallery/index.html +++ b/examples/gallery/index.html @@ -1,7 +1,7 @@ - - + + - + + - + + - + + - + + - + + - + + - + + diff --git a/examples/slide_puzzle/main.rs b/examples/slide_puzzle/main.rs index 51d5cd65508..7ce6f89747b 100644 --- a/examples/slide_puzzle/main.rs +++ b/examples/slide_puzzle/main.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial use slint::Model; use std::cell::RefCell; diff --git a/examples/slide_puzzle/slide_puzzle.slint b/examples/slide_puzzle/slide_puzzle.slint index 124fd16cdd2..a1dd2fd2a91 100644 --- a/examples/slide_puzzle/slide_puzzle.slint +++ b/examples/slide_puzzle/slide_puzzle.slint @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial struct Piece := { // col/row position of the tile in the puzzle diff --git a/examples/todo/cpp/CMakeLists.txt b/examples/todo/cpp/CMakeLists.txt index 129d5825782..0606d248191 100644 --- a/examples/todo/cpp/CMakeLists.txt +++ b/examples/todo/cpp/CMakeLists.txt @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial cmake_minimum_required(VERSION 3.14) project(slint_cpp_todo LANGUAGES CXX) diff --git a/examples/todo/cpp/main.cpp b/examples/todo/cpp/main.cpp index 54759a70860..54511c8b89c 100644 --- a/examples/todo/cpp/main.cpp +++ b/examples/todo/cpp/main.cpp @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #include "todo.h" diff --git a/examples/todo/node/main.js b/examples/todo/node/main.js index 0cedb839052..9b754dd10d6 100755 --- a/examples/todo/node/main.js +++ b/examples/todo/node/main.js @@ -1,6 +1,6 @@ #!/usr/bin/env node -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial // import "slint"; let slint = require("slint-ui"); diff --git a/examples/todo/rust/Cargo.toml b/examples/todo/rust/Cargo.toml index 28a06925662..9e8ef9b0b85 100644 --- a/examples/todo/rust/Cargo.toml +++ b/examples/todo/rust/Cargo.toml @@ -1,5 +1,5 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial [package] name = "todo" @@ -8,7 +8,7 @@ authors = ["Slint Developers "] edition = "2021" build = "build.rs" publish = false -license = "(GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)" +license = "GPL-3.0-only OR LicenseRef-Slint-commercial" [[bin]] path = "main.rs" diff --git a/examples/todo/rust/build.rs b/examples/todo/rust/build.rs index e79bf47f73e..a3278f7f5c3 100644 --- a/examples/todo/rust/build.rs +++ b/examples/todo/rust/build.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial fn main() { slint_build::compile("../ui/todo.slint").unwrap(); diff --git a/examples/todo/rust/index.html b/examples/todo/rust/index.html index 628aaf3765c..caa3cb0fe26 100644 --- a/examples/todo/rust/index.html +++ b/examples/todo/rust/index.html @@ -1,7 +1,7 @@ - - + + - + + diff --git a/tools/lsp/sublime/Slint.sublime-syntax b/tools/lsp/sublime/Slint.sublime-syntax index 0f868fcd122..d3a7e5fca67 100644 --- a/tools/lsp/sublime/Slint.sublime-syntax +++ b/tools/lsp/sublime/Slint.sublime-syntax @@ -1,7 +1,7 @@ %YAML 1.2 --- -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial # See http://www.sublimetext.com/docs/3/syntax.html name: Slint diff --git a/tools/lsp/sublime/Slint.tmPreferences b/tools/lsp/sublime/Slint.tmPreferences index fabfe89cd33..e0f7166c08f 100644 --- a/tools/lsp/sublime/Slint.tmPreferences +++ b/tools/lsp/sublime/Slint.tmPreferences @@ -1,8 +1,8 @@ - - + + diff --git a/tools/lsp/util.rs b/tools/lsp/util.rs index 5ffdb618a98..521a28d9c18 100644 --- a/tools/lsp/util.rs +++ b/tools/lsp/util.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial use i_slint_compiler::diagnostics::Spanned; use i_slint_compiler::langtype::Type; diff --git a/tools/online_editor/highlighting.ts b/tools/online_editor/highlighting.ts index 657eea04b87..482addc643b 100644 --- a/tools/online_editor/highlighting.ts +++ b/tools/online_editor/highlighting.ts @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial import * as monaco from 'monaco-editor'; diff --git a/tools/online_editor/index.ts b/tools/online_editor/index.ts index a66a26f00a7..cb42823dc79 100644 --- a/tools/online_editor/index.ts +++ b/tools/online_editor/index.ts @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial import { slint_language } from "./highlighting"; diff --git a/tools/online_editor/preview.ts b/tools/online_editor/preview.ts index aee26df7e06..b31675f8b38 100644 --- a/tools/online_editor/preview.ts +++ b/tools/online_editor/preview.ts @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial import slint_init, * as slint from "../../../wasm-interpreter/slint_wasm_interpreter.js"; diff --git a/tools/online_editor/vite.config.js b/tools/online_editor/vite.config.js index de5c4202b2d..c619ecb1b91 100644 --- a/tools/online_editor/vite.config.js +++ b/tools/online_editor/vite.config.js @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial import { defineConfig } from 'vite' export default defineConfig(({ command, mode }) => { diff --git a/tools/syntax_updater/Cargo.toml b/tools/syntax_updater/Cargo.toml index 7509c1fe8dc..b868590a03e 100644 --- a/tools/syntax_updater/Cargo.toml +++ b/tools/syntax_updater/Cargo.toml @@ -1,12 +1,12 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial [package] name = "syntax_updater" version = "0.2.0" authors = ["Slint Developers "] edition = "2021" -license = "(GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)" +license = "GPL-3.0-only OR LicenseRef-Slint-commercial" publish = false description = "Tool used to update .slint files when we do syntax upgrade" repository = "https://github.com/slint-ui/slint" diff --git a/tools/syntax_updater/from_0_0_5.rs b/tools/syntax_updater/from_0_0_5.rs index 48259a279f8..53cad9224e1 100644 --- a/tools/syntax_updater/from_0_0_5.rs +++ b/tools/syntax_updater/from_0_0_5.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial use std::io::Write; diff --git a/tools/syntax_updater/from_0_0_6.rs b/tools/syntax_updater/from_0_0_6.rs index ce78dc75e5c..d70c54a50d9 100644 --- a/tools/syntax_updater/from_0_0_6.rs +++ b/tools/syntax_updater/from_0_0_6.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial use std::io::Write; diff --git a/tools/syntax_updater/from_0_1_0.rs b/tools/syntax_updater/from_0_1_0.rs index 5f9cef04358..28ed1eac067 100644 --- a/tools/syntax_updater/from_0_1_0.rs +++ b/tools/syntax_updater/from_0_1_0.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial use std::io::Write; diff --git a/tools/syntax_updater/main.rs b/tools/syntax_updater/main.rs index 71fc07e0f60..8502f953b75 100644 --- a/tools/syntax_updater/main.rs +++ b/tools/syntax_updater/main.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial //! //! Tool to change the syntax or reformat a .slint file diff --git a/tools/viewer/Cargo.toml b/tools/viewer/Cargo.toml index 646c05709f6..bfaa2b94718 100644 --- a/tools/viewer/Cargo.toml +++ b/tools/viewer/Cargo.toml @@ -1,12 +1,12 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial [package] name = "slint-viewer" version = "0.2.0" authors = ["Slint Developers "] edition = "2021" -license = "(GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)" +license = "GPL-3.0-only OR LicenseRef-Slint-commercial" description = "Viewer binary for Slint" repository = "https://github.com/slint-ui/slint" homepage = "https://slint-ui.com" diff --git a/tools/viewer/main.rs b/tools/viewer/main.rs index af694131880..cc0e0f076c5 100644 --- a/tools/viewer/main.rs +++ b/tools/viewer/main.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial #![doc = include_str!("README.md")] diff --git a/vscode_extension/src/extension.ts b/vscode_extension/src/extension.ts index cae4e0b6eb5..b4a95f86c3d 100644 --- a/vscode_extension/src/extension.ts +++ b/vscode_extension/src/extension.ts @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial import * as path from 'path'; import { existsSync } from 'fs'; diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 07554b3072b..9cd37369bc6 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -1,12 +1,12 @@ -# Copyright © SixtyFPS GmbH -# SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +# Copyright © SixtyFPS GmbH +# SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial [package] name = "xtask" version = "0.2.0" authors = ["Slint Developers "] edition = "2021" -license = "(GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)" +license = "GPL-3.0-only OR LicenseRef-Slint-commercial" publish = false [dependencies] diff --git a/xtask/src/cppdocs.rs b/xtask/src/cppdocs.rs index a5632f7fe6a..598955e76da 100644 --- a/xtask/src/cppdocs.rs +++ b/xtask/src/cppdocs.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial // cspell:ignore cppdocs pipenv pipfile diff --git a/xtask/src/license_headers_check.rs b/xtask/src/license_headers_check.rs index a4e705b4199..62864928d0f 100644 --- a/xtask/src/license_headers_check.rs +++ b/xtask/src/license_headers_check.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial use anyhow::Context; use anyhow::Result; @@ -339,12 +339,12 @@ impl<'a> LicenseHeader<'a> { } } -const EXPECTED_SPDX_EXPRESSION: &str = "(GPL-3.0-only OR LicenseRef-SixtyFPS-commercial)"; +const EXPECTED_SPDX_EXPRESSION: &str = "GPL-3.0-only OR LicenseRef-Slint-commercial"; const EXPECTED_SPDX_ID: &str = const_format::concatcp!("SP", "DX-License-Identifier: ", EXPECTED_SPDX_EXPRESSION); // Do not confuse the reuse tool const EXPECTED_HEADER: LicenseHeader<'static> = - LicenseHeader(&["Copyright © SixtyFPS GmbH ", EXPECTED_SPDX_ID]); + LicenseHeader(&["Copyright © SixtyFPS GmbH ", EXPECTED_SPDX_ID]); const EXPECTED_HOMEPAGE: &str = "https://slint-ui.com"; const EXPECTED_REPOSITORY: &str = "https://github.com/slint-ui/slint"; diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 850a84456dd..645d8db678f 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial use anyhow::Context; use clap::Parser; diff --git a/xtask/src/nodepackage.rs b/xtask/src/nodepackage.rs index c6fa19417b2..04764415631 100644 --- a/xtask/src/nodepackage.rs +++ b/xtask/src/nodepackage.rs @@ -1,5 +1,5 @@ -// Copyright © SixtyFPS GmbH -// SPDX-License-Identifier: (GPL-3.0-only OR LicenseRef-SixtyFPS-commercial) +// Copyright © SixtyFPS GmbH +// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-commercial use anyhow::Context; use xshell::{cmd, cp, pushd, read_dir, read_file, rm_rf, write_file};