Skip to content

Commit

Permalink
License update (GPLv2 -> GPLv3)
Browse files Browse the repository at this point in the history
- updated the main license from GPLv2 to GPLv3. This was necessary
  because newer Qt modules (like Quick3D) are not available under
  the GPLv2 anymore.
- replaced the verbose per-file license headers with SPDX headers.
- license headers were missing in most QML files and scripts.
- simplified the license section of the "About" dialog.
  • Loading branch information
rgriebl committed Feb 18, 2023
1 parent 1eb7d52 commit da0ce99
Show file tree
Hide file tree
Showing 312 changed files with 6,924 additions and 8,387 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build_cmake.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Copyright (C) 2004-2023 Robert Griebl
# SPDX-License-Identifier: GPL-3.0-only

name: CMake Build Matrix

env:
Expand Down
2 changes: 2 additions & 0 deletions 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright (C) 2004-2023 Robert Griebl
# SPDX-License-Identifier: GPL-3.0-only

target_sources(${PROJECT_NAME} PUBLIC
lzma/bs_lzma.h
Expand Down
16 changes: 3 additions & 13 deletions 3rdparty/lzma/bs_lzma.cpp
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
/* Copyright (C) 2004-2022 Robert Griebl. All rights reserved.
**
** This file is part of BrickStore.
**
** This file may be distributed and/or modified under the terms of the GNU
** General Public License version 2 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://fsf.org/licensing/licenses/gpl.html for GPL licensing information.
*/
// Copyright (C) 2004-2023 Robert Griebl
// SPDX-License-Identifier: GPL-3.0-only

#include <QByteArray>
#include <QFile>
#include <QSaveFile>
Expand Down
16 changes: 3 additions & 13 deletions 3rdparty/lzma/bs_lzma.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
/* Copyright (C) 2004-2022 Robert Griebl. All rights reserved.
**
** This file is part of BrickStore.
**
** This file may be distributed and/or modified under the terms of the GNU
** General Public License version 2 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://fsf.org/licensing/licenses/gpl.html for GPL licensing information.
*/
// Copyright (C) 2004-2023 Robert Griebl
// SPDX-License-Identifier: GPL-3.0-only

#pragma once

#include <functional>
Expand Down
16 changes: 3 additions & 13 deletions 3rdparty/minizip/minizip.cpp
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
/* Copyright (C) 2004-2022 Robert Griebl. All rights reserved.
**
** This file is part of BrickStore.
**
** This file may be distributed and/or modified under the terms of the GNU
** General Public License version 2 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://fsf.org/licensing/licenses/gpl.html for GPL licensing information.
*/
// Copyright (C) 2004-2023 Robert Griebl
// SPDX-License-Identifier: GPL-3.0-only

#include <QFile>

#if Q_BYTE_ORDER == Q_BIG_ENDIAN
Expand Down
16 changes: 3 additions & 13 deletions 3rdparty/minizip/minizip.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
/* Copyright (C) 2004-2022 Robert Griebl. All rights reserved.
**
** This file is part of BrickStore.
**
** This file may be distributed and/or modified under the terms of the GNU
** General Public License version 2 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://fsf.org/licensing/licenses/gpl.html for GPL licensing information.
*/
// Copyright (C) 2004-2023 Robert Griebl
// SPDX-License-Identifier: GPL-3.0-only

#pragma once

#include <QCoreApplication>
Expand Down
912 changes: 623 additions & 289 deletions 3rdparty/qtwinextras/LICENSE.GPL

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# Copyright (C) 2004-2023 Robert Griebl
# SPDX-License-Identifier: GPL-3.0-only

cmake_minimum_required(VERSION 3.19.0)

Expand Down Expand Up @@ -31,7 +33,7 @@ set(BRICKLINK_AFFILIATE_API_KEY "" CACHE STRING "BrickLink's Affiliate API key"

set(NAME "BrickStore")
set(DESCRIPTION "${NAME} - an offline BrickLink inventory management tool.")
set(COPYRIGHT "2004-2022 Robert Griebl")
set(COPYRIGHT "2004-2023 Robert Griebl")
set(BRICKSTORE_URL "brickforge.de/brickstore")
set(GITHUB_URL "github.com/rgriebl/brickstore")
set(BUILD_NUMBER "$ENV{BUILD_NUMBER}")
Expand Down
Loading

0 comments on commit da0ce99

Please sign in to comment.