Merge branch 'master' into add-ci

.krazy

@@ -1,7 +1,7 @@
 CHECKSETS qt5,c++,foss
 
 #KDAB-specific checks
-EXTRA kdabcopyright-reuse,kdabcommercial-reuse,fosslicense-reuse
+EXTRA kdabcopyright-reuse,kdabcontactus,fosslicense-reuse
 
 #additional checks
 #EXTRA defines,null

.pre-commit-config.yaml

@@ -22,12 +22,12 @@ repos:
   - id: pylint
     exclude: ^(.cmake-format.py|conan/.*/conanfile.py)
 - repo: https://github.com/pre-commit/mirrors-autopep8
-  rev: v2.0.0
+  rev: v2.0.2
   hooks:
   - id: autopep8
     exclude: ^(.cmake-format.py|conan/.*/conanfile.py)
 - repo: https://github.com/codespell-project/codespell
-  rev: v2.2.2
+  rev: v2.2.4
   hooks:
   - id: codespell
 - repo: https://github.com/cheshirekow/cmake-format-precommit
@@ -45,6 +45,6 @@ repos:
     language: ruby
     files: \.(md|mdown|markdown)$
 - repo: https://github.com/fsfe/reuse-tool
-  rev: v1.0.0
+  rev: v1.1.2
   hooks:
   - id: reuse

.reuse/dep5

@@ -6,12 +6,12 @@ Source: https://www.github.com/KDAB/GammaRay
 #misc source code
 Files: *.ui *.qrc *.json CMakePresets.json GammaRay.desktop app/Info.plist.in client/Info.plist.in launcher/app/Info.plist.in launcher/cli/Info.plist.in com.kdab.GammaRay.metainfo.xml resources/gammaray/authors docs/collection/about.txt *.frag *.geom *.vert *.ts *.qm *.map cmake/gammaray.rc.cmake
 Copyright: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
-License: GPL-2.0-or-later OR LicenseRef-KDAB-GammaRay
+License: GPL-2.0-or-later
 
 #misc documentation
 Files: CHANGES CONTRIBUTORS.txt INSTALL.md README.md docs/man/gammaray.pod *.dox *.html *.css docs/GammaRay-CopyrightAssignmentForm.pdf ui/resources/gammaray/ui/icons/classes/qtquick2/README ui/resources/gammaray/ui/icons/classes/qtwidgets/README
 Copyright: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
-License: GPL-2.0-or-later OR LicenseRef-KDAB-GammaRay
+License: GPL-2.0-or-later
 
 #misc config files
 Files: 3rdparty/*/qt_attribution.json .clang-format .clang-tidy .clangd .clazy .cmake-format.py .codespellrc .emacs-dirvars .git-blame-ignore-revs .gitattributes .gitignore .kateconfig .krazy .mdlrc .mdlrc.rb .pep8 .pre-commit-config.yaml .pylintrc .qmake.conf .tag .travis.yml appveyor.ini appveyor.yml distro/* format.config.uncrustify.4_spaces *.qdocconf format_sources docs/collection/gammaray.qhcp.cmake examples/yocto/gammaray_git.bb probe/gammaray_probe-android-dependencies.xml docs/api/Doxyfile.cmake .github/workflows/*.yml
@@ -21,7 +21,7 @@ License: BSD-3-Clause
 #artwork
 Files: ui/resources/gammaray/*.png plugins/guisupport/images/*.png ui/resources/gammaray/ui/icons/classes/*/*.png  ui/resources/gammaray/ui/*/*/*.png docs/manual/*/*.png docs/api/*.png tests/manual/*.png plugins/positioning/*.png plugins/quickinspector/textureextension/resources/*.png launcher/ui/resources/launcher/*.png ui/resources/svg/*.svg ui/resources/svg/*.svgz plugins/positioning/direction_marker.svg ui/resources/gammaray/GammaRay.icns ui/resources/gammaray/GammaRay.ico
 Copyright: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
-License: GPL-2.0-or-later OR LicenseRef-KDAB-GammaRay
+License: GPL-2.0-or-later
 
 #3rdparty from Qt
 Files: 3rdparty/qt/5.5/private/*
@@ -46,7 +46,7 @@ License: LGPL-2.1-only OR LicenseRef-Qt-LGPL_EXCEPTION
 
 Files: compat/qasconst.h
 Copyright: 2016 The Qt Company Ltd
-Copyright: 2016 Intel Corporation
+           2016 Intel Corporation
 License: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-or-later OR LicenseRef-Qt-Commercial
 
 #3rdparty StackWalker

3rdparty/StackWalker/qt_attribution.json

@@ -6,7 +6,7 @@
 
     "Description": "Callstack access for Windows.",
     "Homepage": "https://github.com/JochenKalmbach/StackWalker",
-    "Version": "5b0df7a4db8896f6b6dc45d36e383c52577e3c6b"
+    "Version": "5b0df7a4db8896f6b6dc45d36e383c52577e3c6b",
 
     "License": "BSD 2-Clause \"Simplified\" License",
     "LicenseId": "BSD-2-Clause",

3rdparty/qt/resourcemodel.cpp

@@ -1123,7 +1123,6 @@ QFileInfo ResourceModel::fileInfo(const QModelIndex &index) const
 
 void ResourceModelPrivate::init()
 {
-    Q_Q(ResourceModel);
     filters = QDir::AllEntries | QDir::NoDotAndDotDot;
     sort = QDir::Name;
     nameFilters << QLatin1String("*");

CHANGES

@@ -3,6 +3,7 @@ Release Highlights
 
 Version 3.0.0 (unreleased)
 --------------------------
+ * Remove the KDAB commercial license.
  * Increase CMake requirement to version 3.16.0.
  * Port to Qt6 (in-progress).
  * Network operations now optionally allow capturing HTTP response body.

CMakeLists.txt

@@ -1,14 +1,10 @@
-#
 # This file is part of GammaRay, the Qt application inspection and manipulation tool.
 #
 # SPDX-FileCopyrightText: 2010-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
 #
-# SPDX-License-Identifier: GPL-2.0-or-later OR LicenseRef-KDAB-GammaRay
-#
-# Licensees holding valid commercial KDAB GammaRay licenses may use this file in
-# accordance with GammaRay Commercial License Agreement provided with the Software.
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
-# Contact [email protected] if any conditions of this licensing are not clear to you.
+# Contact KDAB at <[email protected]> for commercial licensing options.
 #
 
 # This is the top-level CMakeLists.txt file for the GammaRay project.
@@ -60,10 +56,6 @@
 #  Build GammaRay documentation
 #  Default=true (always false if cross-compiling or building probe-only (see GAMMARAY_PROBE_ONLY_BUILD))
 #
-# -DGAMMARAY_ENABLE_GPL_ONLY_FEATURES=[true|false]
-#  Enable features only available under GPL license
-#  Default=false
-#
 # -DGAMMARAY_ENFORCE_QT_ASSERTS=[true|false]
 #  Force QT_ASSERT in all builds
 #  Default=false
@@ -250,7 +242,6 @@ if(GAMMARAY_PROBE_ONLY_BUILD AND GAMMARAY_CLIENT_ONLY_BUILD)
     message(FATAL_ERROR "You can only use one of the *ONLY* option.")
 endif()
 
-gammaray_option(GAMMARAY_ENABLE_GPL_ONLY_FEATURES "Enable features only available under GPL license." OFF)
 gammaray_option(GAMMARAY_INSTALL_QT_LAYOUT "Install into Qt directory layout." OFF)
 gammaray_option(GAMMARAY_MULTI_BUILD "Build multiple applicable probe configurations." ON)
 gammaray_option(GAMMARAY_BUILD_CLI_INJECTOR "Build command line injector on Windows." ON)

GammaRayConfig.cmake.in

@@ -2,12 +2,9 @@
 #
 # SPDX-FileCopyrightText: 2014-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
 #
-# SPDX-License-Identifier: GPL-2.0-or-later OR LicenseRef-KDAB-GammaRay
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
-# Licensees holding valid commercial KDAB GammaRay licenses may use this file in
-# accordance with GammaRay Commercial License Agreement provided with the Software.
-#
-# Contact [email protected] if any conditions of this licensing are not clear to you.
+# Contact KDAB at <[email protected]> for commercial licensing options.
 #
 @PACKAGE_INIT@
 

INSTALL.md

@@ -120,7 +120,8 @@ To build a debug version pass `-DCMAKE_BUILD_TYPE=Debug` to cmake.
 You'll find more information on this in the wiki:
 <https://github.com/KDAB/GammaRay/wiki/Cross-compiling-GammaRay>
 
-== Force a probe only build ==
+## Force a probe only build
+
 If you already built GammaRay in the past and that you want to support more probes,
 you don't need to rebuild entirely GammaRay for this specific Qt version.
 You can instead just build the GammaRay probe for the new Qt version and install it

LICENSE.txt

@@ -4,9 +4,6 @@ The GammaRay Software is (C) 2010-2023 Klarälvdalens Datakonsult AB (KDAB),
 and is available under the terms of the GPL version 2 (or any later version,
 at your option).
 
-Commercial licensing terms are available in the included file
-LICENSES/LicenseRef-KDAB-GammaRay.txt.
-
 Note that this software relies on 3rd party MIT-licensed projects
 and various other freely distributable files some of which are
 unused only for testing and not part of the application itself.

README.md

@@ -1,4 +1,4 @@
-# <a name="title"></a> <img src="/ui/resources/gammaray/ui/light/pixmaps/GammaRay-logo.png" height="350px" title="Logo">
+# <a name="title"></a> [![Logo](ui/resources/gammaray/ui/light/pixmaps/GammaRay-logo-small.png)](https://www.kdab.com/gammaray)
 
 GammaRay is a software introspection tool for Qt applications developed by KDAB.
 Leveraging the QObject introspection mechanism it allows you to observe and
@@ -75,11 +75,14 @@ and is available under the terms of the GPL version 2 (or any later version,
 at your option).  See [GPL-2.0-or-later.txt](LICENSES/GPL-2.0-or-later.txt)
 for license details.
 
-Commercial licensing terms are available in the included file
-[LicenseRef-KDAB-GammaRay.txt](LICENSES/LicenseRef-KDAB-GammaRay.txt).
+Contact KDAB at <[email protected]> to inquire about commercial licensing.
 
 For terms of redistribution, refer to the corresponding license agreement.
 
+Note that this software relies on 3rd party MIT-licensed projects
+and various other freely distributable files some of which are
+unused only for testing and not part of the application itself.
+
 ## About KDAB
 
 GammaRay is supported and maintained by Klarälvdalens Datakonsult AB (KDAB).

app/CMakeLists.txt

@@ -2,12 +2,9 @@
 #
 # SPDX-FileCopyrightText: 2015-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
 #
-# SPDX-License-Identifier: GPL-2.0-or-later OR LicenseRef-KDAB-GammaRay
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
-# Licensees holding valid commercial KDAB GammaRay licenses may use this file in
-# accordance with GammaRay Commercial License Agreement provided with the Software.
-#
-# Contact [email protected] if any conditions of this licensing are not clear to you.
+# Contact KDAB at <[email protected]> for commercial licensing options.
 #
 # Integrated launcher/client for Mac app bundles
 if(APPLE)

app/main.cpp

@@ -6,12 +6,9 @@
   SPDX-FileCopyrightText: 2015-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
   Author: Volker Krause <[email protected]>
 
-  SPDX-License-Identifier: GPL-2.0-or-later OR LicenseRef-KDAB-GammaRay
+  SPDX-License-Identifier: GPL-2.0-or-later
 
-  Licensees holding valid commercial KDAB GammaRay licenses may use this file in
-  accordance with GammaRay Commercial License Agreement provided with the Software.
-
-  Contact [email protected] if any conditions of this licensing are not clear to you.
+  Contact KDAB at <[email protected]> for commercial licensing options.
 */
 
 #include <config-gammaray.h>

client/CMakeLists.txt

@@ -2,12 +2,9 @@
 #
 # SPDX-FileCopyrightText: 2013-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
 #
-# SPDX-License-Identifier: GPL-2.0-or-later OR LicenseRef-KDAB-GammaRay
+# SPDX-License-Identifier: GPL-2.0-or-later
 #
-# Licensees holding valid commercial KDAB GammaRay licenses may use this file in
-# accordance with GammaRay Commercial License Agreement provided with the Software.
-#
-# Contact [email protected] if any conditions of this licensing are not clear to you.
+# Contact KDAB at <[email protected]> for commercial licensing options.
 #
 set(gammaray_clientlib_srcs
     client.cpp

client/classesiconsrepositoryclient.cpp

@@ -6,12 +6,9 @@
   SPDX-FileCopyrightText: 2016-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
   Author: Filipe Azevedo <[email protected]>
 
-  SPDX-License-Identifier: GPL-2.0-or-later OR LicenseRef-KDAB-GammaRay
+  SPDX-License-Identifier: GPL-2.0-or-later
 
-  Licensees holding valid commercial KDAB GammaRay licenses may use this file in
-  accordance with GammaRay Commercial License Agreement provided with the Software.
-
-  Contact [email protected] if any conditions of this licensing are not clear to you.
+  Contact KDAB at <[email protected]> for commercial licensing options.
 */
 
 #include "classesiconsrepositoryclient.h"

client/classesiconsrepositoryclient.h

@@ -6,12 +6,9 @@
   SPDX-FileCopyrightText: 2016-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
   Author: Filipe Azevedo <[email protected]>
 
-  SPDX-License-Identifier: GPL-2.0-or-later OR LicenseRef-KDAB-GammaRay
+  SPDX-License-Identifier: GPL-2.0-or-later
 
-  Licensees holding valid commercial KDAB GammaRay licenses may use this file in
-  accordance with GammaRay Commercial License Agreement provided with the Software.
-
-  Contact [email protected] if any conditions of this licensing are not clear to you.
+  Contact KDAB at <[email protected]> for commercial licensing options.
 */
 
 #ifndef GAMMARAY_CLASSESICONSREPOSITORYCLIENT_H

client/client.cpp

@@ -6,12 +6,9 @@
   SPDX-FileCopyrightText: 2013-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
   Author: Volker Krause <[email protected]>
 
-  SPDX-License-Identifier: GPL-2.0-or-later OR LicenseRef-KDAB-GammaRay
+  SPDX-License-Identifier: GPL-2.0-or-later
 
-  Licensees holding valid commercial KDAB GammaRay licenses may use this file in
-  accordance with GammaRay Commercial License Agreement provided with the Software.
-
-  Contact [email protected] if any conditions of this licensing are not clear to you.
+  Contact KDAB at <[email protected]> for commercial licensing options.
 */
 
 #include "client.h"

client/client.h

@@ -6,12 +6,9 @@
   SPDX-FileCopyrightText: 2013-2023 Klarälvdalens Datakonsult AB, a KDAB Group company <[email protected]>
   Author: Volker Krause <[email protected]>
 
-  SPDX-License-Identifier: GPL-2.0-or-later OR LicenseRef-KDAB-GammaRay
+  SPDX-License-Identifier: GPL-2.0-or-later
 
-  Licensees holding valid commercial KDAB GammaRay licenses may use this file in
-  accordance with GammaRay Commercial License Agreement provided with the Software.
-
-  Contact [email protected] if any conditions of this licensing are not clear to you.
+  Contact KDAB at <[email protected]> for commercial licensing options.
 */
 
 #ifndef GAMMARAY_CLIENT_H