Skip to content

Commit

Permalink
Merge branch 'kdsoap-2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
Allen Winter committed Jan 3, 2024
2 parents abd2d73 + ac216de commit e542665
Show file tree
Hide file tree
Showing 223 changed files with 227 additions and 302 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ on:
branches:
- master
- kdsoap-2.1
- kdsoap-2.2
pull_request:
branches:
- master
- kdsoap-2.1
- kdsoap-2.2

jobs:
build:
Expand Down
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/KDSoap

#misc source code
Files: unittests/*/*.xsd unittests/*/*.wsdl unittests/*/*.XSD unittests/*/*.xml testtools/*.qrc examples/*/*.qrc examples/*/*.wsdl *.html *.css docs/manual/*.pdf *.bat *.pem
Copyright: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
Copyright: 2010-2024 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
License: MIT

#artwork
Files: images/*.png docs/api/*.png docs/*.png docs/*.odg examples/*/*.mng examples/*/*.gif
Copyright: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
Copyright: 2010-2024 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
License: MIT

#misc documentation
Files: *md *.txt *.html docs/manual/*.pdf
Copyright: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
Copyright: 2010-2024 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
License: MIT

#misc config files
Files: .pre-commit-config.yaml .codespellrc .krazy .cmake-format.py .clang-format .clang-tidy .clazy .codedocs .gitignore .gitmodules .mdlrc .mdlrc.rb .pep8 .pylintrc appveyor.yml docs/api/Doxyfile.cmake distro/*
Copyright: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
Copyright: 2010-2024 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
License: BSD-3-Clause

Files: kdwsdl2cpp/schemas/soapenc-1.1.xsd
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#
# This file is part of the KD Soap project.
#
# SPDX-FileCopyrightText: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
Expand Down
3 changes: 1 addition & 2 deletions FindKDSoap.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Soap project.
#
# SPDX-FileCopyrightText: 2011-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2011 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#
Expand Down
3 changes: 1 addition & 2 deletions KDSoapConfig-buildtree.cmake.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Soap project.
#
# SPDX-FileCopyrightText: 2013-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2013 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#
Expand Down
3 changes: 1 addition & 2 deletions KDSoapConfig.cmake.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Soap project.
#
# SPDX-FileCopyrightText: 2012-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#
Expand Down
3 changes: 1 addition & 2 deletions KDSoapMacros.cmake.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Soap project.
#
# SPDX-FileCopyrightText: 2011-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2011 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# 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 Soap Software is Copyright 2010-2023 Klarälvdalens Datakonsult AB (KDAB),
The KD Soap Software is Copyright 2010-2024 Klarälvdalens Datakonsult AB (KDAB),
and is available under the terms of the MIT license.

Note that this project requires the 3rd party 'libkode' submodule
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Thanks to our [contributors](CONTRIBUTORS.txt).

## License

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

Contact KDAB at <[email protected]> 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 Soap project.
#
# SPDX-FileCopyrightText: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2010 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# 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 Soap project.
#
# SPDX-FileCopyrightText: 2021-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2021 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# 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 Soap project.
#
# SPDX-FileCopyrightText: 2021-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2021 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# 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; 2010-2023 Klar&auml;lvdalens Datakonsult AB (KDAB)</font>
<font style="font-weight: bold;">&copy; 2010-2024 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
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 Soap project.
#
# SPDX-FileCopyrightText: 2012-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#
Expand Down
3 changes: 1 addition & 2 deletions examples/bank_gui/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Soap project.
#
# SPDX-FileCopyrightText: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2019 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion examples/bank_gui/bank_gui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Soap project.
**
** SPDX-FileCopyrightText: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
** SPDX-FileCopyrightText: 2019 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion examples/bank_gui/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Soap project.
**
** SPDX-FileCopyrightText: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
** SPDX-FileCopyrightText: 2019 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion examples/bank_gui/mainwindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Soap project.
**
** SPDX-FileCopyrightText: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
** SPDX-FileCopyrightText: 2019 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
**
** SPDX-License-Identifier: MIT
**
Expand Down
3 changes: 1 addition & 2 deletions examples/bank_wsdl/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Soap project.
#
# SPDX-FileCopyrightText: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2019 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion examples/bank_wsdl/bank_wsdl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Soap project.
**
** SPDX-FileCopyrightText: 2019-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
** SPDX-FileCopyrightText: 2019 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
**
** SPDX-License-Identifier: MIT
**
Expand Down
3 changes: 1 addition & 2 deletions examples/helloworld_client/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Soap project.
#
# SPDX-FileCopyrightText: 2012-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion examples/helloworld_client/helloworld_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Soap project.
**
** SPDX-FileCopyrightText: 2011-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
** SPDX-FileCopyrightText: 2011 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion examples/helloworld_client/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 Soap project.
**
** SPDX-FileCopyrightText: 2011-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
** SPDX-FileCopyrightText: 2011 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
**
** SPDX-License-Identifier: MIT
**
Expand Down
3 changes: 1 addition & 2 deletions examples/helloworld_server/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Soap project.
#
# SPDX-FileCopyrightText: 2012-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion examples/helloworld_server/helloworld_serverobject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Soap project.
**
** SPDX-FileCopyrightText: 2011-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
** SPDX-FileCopyrightText: 2011 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion examples/helloworld_server/helloworld_serverobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Soap project.
**
** SPDX-FileCopyrightText: 2011-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
** SPDX-FileCopyrightText: 2011 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion examples/helloworld_server/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 Soap project.
**
** SPDX-FileCopyrightText: 2011-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
** SPDX-FileCopyrightText: 2011 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion features/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is part of the KD Soap project.
#
# SPDX-FileCopyrightText: 2012-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#
Expand Down
3 changes: 1 addition & 2 deletions features/kdsoap.prf
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Soap project.
#
# SPDX-FileCopyrightText: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2010 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#
Expand Down
3 changes: 1 addition & 2 deletions kdsoap.pri
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Soap project.
#
# SPDX-FileCopyrightText: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2010 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#
Expand Down
3 changes: 1 addition & 2 deletions kdwsdl2cpp.pri
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Soap project.
#
# SPDX-FileCopyrightText: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2010 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#
Expand Down
3 changes: 1 addition & 2 deletions kdwsdl2cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Soap project.
#
# SPDX-FileCopyrightText: 2012-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion kdwsdl2cpp/kode_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 Soap project.
**
** SPDX-FileCopyrightText: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
** SPDX-FileCopyrightText: 2010 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion scripts/genignore.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# This file is part of the KD Soap project.
#
# SPDX-FileCopyrightText: 2022-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2022 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#
Expand Down
3 changes: 1 addition & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Soap project.
#
# SPDX-FileCopyrightText: 2012-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#
Expand Down
3 changes: 1 addition & 2 deletions src/KDSoapClient/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#
# This file is part of the KD Soap project.
#
# SPDX-FileCopyrightText: 2012-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
# SPDX-FileCopyrightText: 2012 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
#
# SPDX-License-Identifier: MIT
#
Expand Down
2 changes: 1 addition & 1 deletion src/KDSoapClient/KDDateTime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Soap project.
**
** SPDX-FileCopyrightText: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
** SPDX-FileCopyrightText: 2010 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion src/KDSoapClient/KDDateTime.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Soap project.
**
** SPDX-FileCopyrightText: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
** SPDX-FileCopyrightText: 2010 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion src/KDSoapClient/KDSoap.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Soap project.
**
** SPDX-FileCopyrightText: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
** SPDX-FileCopyrightText: 2010 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion src/KDSoapClient/KDSoapAuthentication.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Soap project.
**
** SPDX-FileCopyrightText: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
** SPDX-FileCopyrightText: 2010 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion src/KDSoapClient/KDSoapAuthentication.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Soap project.
**
** SPDX-FileCopyrightText: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
** SPDX-FileCopyrightText: 2010 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
**
** SPDX-License-Identifier: MIT
**
Expand Down
2 changes: 1 addition & 1 deletion src/KDSoapClient/KDSoapClientInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
**
** This file is part of the KD Soap project.
**
** SPDX-FileCopyrightText: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
** SPDX-FileCopyrightText: 2010 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
**
** SPDX-License-Identifier: MIT
**
Expand Down
Loading

0 comments on commit e542665

Please sign in to comment.