Skip to content

Commit

Permalink
Merge branch 'kdreports-2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Allen Winter committed Jan 15, 2024
2 parents d4d76af + ce3e8a1 commit 94ac809
Show file tree
Hide file tree
Showing 167 changed files with 170 additions and 211 deletions.
8 changes: 4 additions & 4 deletions .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@ Source: https://www.github.com/KDAB/KDReports

#misc source code
Files: *.qrc *.ui *.xml *.csv *.bat *.ts
Copyright: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
Copyright: Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
License: MIT

#artwork
Files: images/*.png images/*.svg docs/api/*.png pics/*.png examples/*/*.png examples/*/*.jpg python/examples/*/*.jpg python/examples/*/*.png python/examples-qt6/*.jpg python/examples-qt6/*/*.png
Copyright: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
Copyright: Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
License: MIT

#misc documentation
Files: *md *.txt *.html docs/manual/*.pdf
Copyright: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
Copyright: Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
License: MIT

#misc config files
Files: .pre-commit-config.yaml .codespellrc .krazy .cmake-format.py .clang-format .clang-tidy .clazy .gitignore .mdlrc .mdlrc.rb .pep8 .pylintrc appveyor.yml docs/api/Doxyfile.cmake distro/*
Copyright: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
Copyright: Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
License: BSD-3-Clause

#3rdparty
Expand Down
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Reports library.
#
# SPDX-FileCopyrightText: 2015-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
# SPDX-FileCopyrightText: 2015 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
License
=======
The KD Reports Software is Copyright 2007-2023 Klarälvdalens Datakonsult AB (KDAB),
The KD Reports Software is © 2007 Klarälvdalens Datakonsult AB (KDAB),
and is available under the terms of the MIT license.

See the full license text in the LICENSES folder.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Please submit your contributions or issue reports from our GitHub space at

## License

The KD Reports Software is Copyright 2007-2023 Klarälvdalens Datakonsult AB (KDAB),
The KD Reports Software is © 2007 Klarälvdalens Datakonsult AB (KDAB),
and is available under the terms of the [MIT](LICENSES/MIT.txt) license.

Contact KDAB at <info@kdab.com> for any licensing queries.
Expand Down
3 changes: 1 addition & 2 deletions conan/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Reports library.
#
# SPDX-FileCopyrightText: 2020-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
# SPDX-FileCopyrightText: 2020 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down
3 changes: 1 addition & 2 deletions docs/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Reports library.
#
# SPDX-FileCopyrightText: 2021-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
# SPDX-FileCopyrightText: 2021 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down
3 changes: 1 addition & 2 deletions docs/api/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Reports library.
#
# SPDX-FileCopyrightText: 2021-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
# SPDX-FileCopyrightText: 2021 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion docs/api/footer.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<hr>
<div style="float: left;">
<img src="kdab-logo-22x22.png">
<font style="font-weight: bold;">&copy; 2007-2023 Klar&auml;lvdalens Datakonsult AB (KDAB)</font>
<font style="font-weight: bold;">&copy; Klar&auml;lvdalens Datakonsult AB (KDAB)</font>
<br>
"The Qt, C++ and OpenGL Experts"<br>
<a href="https://www.kdab.com/">https://www.kdab.com/</a>
Expand Down
2 changes: 1 addition & 1 deletion examples/BigImage/BigImage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
3 changes: 1 addition & 2 deletions examples/BigImage/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Reports library.
#
# SPDX-FileCopyrightText: 2015-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
# SPDX-FileCopyrightText: 2015 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down
3 changes: 1 addition & 2 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Reports library.
#
# SPDX-FileCopyrightText: 2015-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
# SPDX-FileCopyrightText: 2015 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down
3 changes: 1 addition & 2 deletions examples/ChartXML/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Reports library.
#
# SPDX-FileCopyrightText: 2015-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
# SPDX-FileCopyrightText: 2015 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion examples/ChartXML/ChartXML.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
3 changes: 1 addition & 2 deletions examples/Database/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Reports library.
#
# SPDX-FileCopyrightText: 2015-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
# SPDX-FileCopyrightText: 2015 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion examples/Database/Database.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
3 changes: 1 addition & 2 deletions examples/DatabaseXML/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Reports library.
#
# SPDX-FileCopyrightText: 2015-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
# SPDX-FileCopyrightText: 2015 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion examples/DatabaseXML/DatabaseXML.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
3 changes: 1 addition & 2 deletions examples/DemoWasm/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
##
# This file is part of the KD Reports library.
#
# SPDX-FileCopyrightText: 2015-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
# SPDX-FileCopyrightText: 2015 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion examples/DemoWasm/ResultModel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion examples/DemoWasm/ResultModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion examples/DemoWasm/TableModel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion examples/DemoWasm/TableModel.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion examples/DemoWasm/kdreportswindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2022-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion examples/DemoWasm/kdreportswindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2022-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion examples/DemoWasm/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2022-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion examples/DemoWasm/tools_export.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
3 changes: 1 addition & 2 deletions examples/HelloWorld/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Reports library.
#
# SPDX-FileCopyrightText: 2015-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
# SPDX-FileCopyrightText: 2015 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion examples/HelloWorld/HelloWorld.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
3 changes: 1 addition & 2 deletions examples/HelloWorldXML/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Reports library.
#
# SPDX-FileCopyrightText: 2015-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
# SPDX-FileCopyrightText: 2015 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion examples/HelloWorldXML/HelloWorldXML.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
3 changes: 1 addition & 2 deletions examples/Labels/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Reports library.
#
# SPDX-FileCopyrightText: 2015-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
# SPDX-FileCopyrightText: 2015 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion examples/Labels/Labels.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
3 changes: 1 addition & 2 deletions examples/Letter/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Reports library.
#
# SPDX-FileCopyrightText: 2015-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
# SPDX-FileCopyrightText: 2015 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion examples/Letter/Letter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
3 changes: 1 addition & 2 deletions examples/LongTextReport/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Reports library.
#
# SPDX-FileCopyrightText: 2015-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
# SPDX-FileCopyrightText: 2015 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion examples/LongTextReport/LongTextReport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
3 changes: 1 addition & 2 deletions examples/MailMergeXML/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Reports library.
#
# SPDX-FileCopyrightText: 2015-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
# SPDX-FileCopyrightText: 2015 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion examples/MailMergeXML/MailMergeXML.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
3 changes: 1 addition & 2 deletions examples/PriceList/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Reports library.
#
# SPDX-FileCopyrightText: 2015-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
# SPDX-FileCopyrightText: 2015 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion examples/PriceList/PriceList.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
3 changes: 1 addition & 2 deletions examples/PriceListXML/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Reports library.
#
# SPDX-FileCopyrightText: 2015-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
# SPDX-FileCopyrightText: 2015 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion examples/PriceListXML/PriceListXML.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Reports library.
**
** SPDX-FileCopyrightText: 2007-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
** SPDX-FileCopyrightText: 2007 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.com>
**
** SPDX-License-Identifier: MIT
**
Expand Down
Loading

0 comments on commit 94ac809

Please sign in to comment.