diff options
| author | Alexandru Croitor <[email protected]> | 2025-03-19 10:42:53 +0100 |
|---|---|---|
| committer | Alexandru Croitor <[email protected]> | 2025-03-27 12:19:59 +0000 |
| commit | 38ad3d7de3105659c3e87bea70a0097fab21d2b2 (patch) | |
| tree | a4fbf2833cef24850293a4492004f779b643f33f | |
| parent | fad8c95857cbe0aa4290b0b01dfb1342c5936f60 (diff) | |
Move license into LICENSES subdir
In preparation for SBOM creation, where we will refer to all licenses
in the LICENSES subdirectory.
Change-Id: I73e54ca0ccf6736c7b03165c2067ab225903b128
Reviewed-by: Eike Ziller <[email protected]>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | LICENSES/LICENSE.GPL3-EXCEPT (renamed from LICENSE.GPL3-EXCEPT) | 0 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | packaging/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | scripts/makedmg.py | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c9fc6b5e458..4ef21f39d0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -195,7 +195,7 @@ feature_summary(INCLUDE_QUIET_PACKAGES WHAT ) if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR - AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.GPL3-EXCEPT") + AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/LICENSES/LICENSE.GPL3-EXCEPT") # Only for opensource, non-super-repo builds add_subdirectory(packaging) endif() diff --git a/LICENSE.GPL3-EXCEPT b/LICENSES/LICENSE.GPL3-EXCEPT index b1cb1bec78a..b1cb1bec78a 100644 --- a/LICENSE.GPL3-EXCEPT +++ b/LICENSES/LICENSE.GPL3-EXCEPT diff --git a/README.md b/README.md index 8a0fd6d1210..bb34c239c57 100644 --- a/README.md +++ b/README.md @@ -364,7 +364,7 @@ http://llvm.org/docs/GettingStarted.html#git-mirror: Qt Creator is available under commercial licenses from The Qt Company, and under the GNU General Public License version 3, annotated with The Qt Company GPL Exception 1.0. -See [LICENSE.GPL3-EXCEPT](LICENSE.GPL3-EXCEPT) for the details. +See [LICENSE.GPL3-EXCEPT](LICENSES/LICENSE.GPL3-EXCEPT) for the details. For more information about the third-party components that Qt Creator includes, see the diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt index 771d16566c0..a4d0e8e54f9 100644 --- a/packaging/CMakeLists.txt +++ b/packaging/CMakeLists.txt @@ -12,7 +12,7 @@ set(CPACK_VERBATIM_VARIABLES YES) # WIX needs a license file ending with .txt file(CREATE_LINK - ${CMAKE_CURRENT_LIST_DIR}/../LICENSE.GPL3-EXCEPT + ${CMAKE_CURRENT_LIST_DIR}/../LICENSES/LICENSE.GPL3-EXCEPT ${CMAKE_CURRENT_BINARY_DIR}/LICENSE.GPL3-EXCEPT.txt COPY_ON_ERROR) set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_BINARY_DIR}/LICENSE.GPL3-EXCEPT.txt) diff --git a/scripts/makedmg.py b/scripts/makedmg.py index f77f03ad263..0c2b404e943 100755 --- a/scripts/makedmg.py +++ b/scripts/makedmg.py @@ -35,7 +35,7 @@ def main(): app_path = [app for app in os.listdir(tempdir) if app.endswith('.app')][0] common.codesign(os.path.join(tempdir, app_path)) os.symlink('/Applications', os.path.join(tempdir, 'Applications')) - license_file = os.path.join(arguments.source_directory, 'LICENSE.GPL3-EXCEPT') + license_file = os.path.join(arguments.source_directory, "LICENSES", 'LICENSE.GPL3-EXCEPT') if (arguments.license_replacement): license_file = arguments.license_replacement shutil.copy(license_file, tempdir) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f537d8b9c4f..65b8dffa319 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,7 +14,7 @@ add_subdirectory(tools) install( FILES ${PROJECT_SOURCE_DIR}/HACKING - ${PROJECT_SOURCE_DIR}/LICENSE.GPL3-EXCEPT + ${PROJECT_SOURCE_DIR}/LICENSES/LICENSE.GPL3-EXCEPT ${PROJECT_SOURCE_DIR}/README.md DESTINATION ${IDE_DATA_PATH} COMPONENT Devel EXCLUDE_FROM_ALL |