Build axivion support plugin

Adapts the CMake files, fixes license.

Change-Id: I6bdce2547d187bcabcc864026e36a1c924015c2a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>

src/plugins/CMakeLists.txt

@@ -20,6 +20,7 @@ add_subdirectory(projectexplorer)
 add_subdirectory(silversearcher)
 
 # Level 3: (only depends on Level 2 and below)
+add_subdirectory(axivion)
 add_subdirectory(bookmarks)
 add_subdirectory(cppeditor)
 add_subdirectory(haskell)

src/plugins/axivion/Axivion.json.in

@@ -8,10 +8,14 @@
     \"Copyright\" : \"(C) $$QTCREATOR_COPYRIGHT_YEAR The Qt Company Ltd\",
     \"License\" : [ \"Commercial Usage\",
                   \"\",
-                  \"Licensees holding valid Qt Enterprise licenses may use this plugin in accordance with the Qt Enterprise License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and The Qt Company.\"
+                  \"Licensees holding valid Qt Commercial licenses may use this plugin in accordance with the Qt Commercial License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and The Qt Company.\",
+                  \"\",
+                  \"GNU General Public License Usage\",
+                  \"\",
+                  \"Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html.\"
     ],
     \"Category\" : \"Code Analyzer\",
     \"Description\" : \"Integration of the axivion dashboard.\",
-    \"Url\" : \"http://www.qt-project.org\",
+    \"Url\" : \"https://www.qt.io\",
     $$dependencyList
 }

src/plugins/axivion/CMakeLists.txt

@@ -1,16 +1,7 @@
-find_package(QtCreator COMPONENTS Core REQUIRED)
-find_package(Qt6 COMPONENTS Network Widgets REQUIRED)
-
-find_package(QtCreatorLicenseChecker QUIET)
-if (TARGET QtCreator::LicenseChecker)
-  set(LICENSECHECKER_DEPENDS QtCreator::LicenseChecker)
-endif()
-
 add_qtc_plugin(Axivion
   PLUGIN_DEPENDS
-    QtCreator::Core QtCreator::ProjectExplorer QtCreator::TextEditor
+    Core ProjectExplorer TextEditor
-    ${LICENSECHECKER_DEPENDS}
+  DEPENDS Qt::Network Qt::Widgets ExtensionSystem Utils
-  DEPENDS Qt::Network Qt::Widgets QtCreator::ExtensionSystem QtCreator::Utils
   SOURCES
     axivion.qrc
     axivionoutputpane.cpp axivionoutputpane.h

src/plugins/axivion/axivionoutputpane.cpp

@@ -1,5 +1,5 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "axivionoutputpane.h"
 

src/plugins/axivion/axivionoutputpane.h

@@ -1,5 +1,5 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #pragma once
 

src/plugins/axivion/axivionplugin.cpp

@@ -1,5 +1,5 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "axivionplugin.h"
 
@@ -30,10 +30,6 @@
 #include <utils/qtcassert.h>
 #include <utils/utilsicons.h>
 
-#ifdef LICENSECHECKER
-#  include <licensechecker/licensecheckerplugin.h>
-#endif
-
 #include <QAction>
 #include <QMessageBox>
 #include <QTimer>
@@ -120,14 +116,6 @@ bool AxivionPlugin::initialize(const QStringList &arguments, QString *errorMessa
     Q_UNUSED(arguments)
     Q_UNUSED(errorMessage)
 
-#ifdef LICENSECHECKER
-    LicenseChecker::LicenseCheckerPlugin *licenseChecker
-            = ExtensionSystem::PluginManager::getObject<LicenseChecker::LicenseCheckerPlugin>();
-
-    if (!licenseChecker || !licenseChecker->hasValidLicense() || !licenseChecker->enterpriseFeatures())
-        return true;
-#endif // LICENSECHECKER
-
     dd = new AxivionPluginPrivate;
     dd->m_axivionSettings.fromSettings(Core::ICore::settings());
 

src/plugins/axivion/axivionplugin.h

@@ -1,5 +1,5 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #pragma once
 

src/plugins/axivion/axivionprojectsettings.cpp

@@ -1,5 +1,5 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "axivionprojectsettings.h"
 

src/plugins/axivion/axivionprojectsettings.h

@@ -1,5 +1,5 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #pragma once
 

src/plugins/axivion/axivionquery.cpp

@@ -1,5 +1,5 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "axivionquery.h"
 

src/plugins/axivion/axivionquery.h

@@ -1,5 +1,5 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #pragma once
 

src/plugins/axivion/axivionresultparser.cpp

@@ -1,5 +1,5 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "axivionresultparser.h"
 

src/plugins/axivion/axivionresultparser.h

@@ -1,5 +1,5 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #pragma once
 

src/plugins/axivion/axivionsettings.cpp

@@ -1,5 +1,5 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "axivionsettings.h"
 

src/plugins/axivion/axivionsettings.h

@@ -1,5 +1,5 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #pragma once
 

src/plugins/axivion/axivionsettingspage.cpp

@@ -1,5 +1,5 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #include "axivionsettingspage.h"
 

src/plugins/axivion/axivionsettingspage.h

@@ -1,5 +1,5 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #pragma once
 

src/plugins/axivion/axiviontr.h

@@ -1,5 +1,5 @@
 // Copyright (C) 2022 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 
 #pragma once
 

src/plugins/plugins.qbs

@@ -7,6 +7,7 @@ Project {
         "android/android.qbs",
         "autotest/autotest.qbs",
         "autotoolsprojectmanager/autotoolsprojectmanager.qbs",
+        "axivion/axivion.qbs",
         "baremetal/baremetal.qbs",
         "bazaar/bazaar.qbs",
         "beautifier/beautifier.qbs",