qds: make code reusable

Change-Id: Ic11917f8a442a1ed15482a1ea492a7cef9f2a7ff
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Tim Jenssen
2022-02-21 15:41:16 +01:00
parent 3be545123a
commit c3bd3d6a62
3 changed files with 73 additions and 32 deletions
+1
View File
@@ -34,6 +34,7 @@ add_qtc_library(Utils
differ.cpp differ.h
displayname.cpp displayname.h
dropsupport.cpp dropsupport.h
dynamiclicensecheck.h
elfreader.cpp elfreader.h
elidinglabel.cpp elidinglabel.h
environment.cpp environment.h
+68
View File
@@ -0,0 +1,68 @@
/****************************************************************************
**
** Copyright (C) 2022 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the 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. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file 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 file. 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.
**
****************************************************************************/
#pragma once
#include <extensionsystem/pluginmanager.h>
#include <extensionsystem/pluginspec.h>
#include <extensionsystem/iplugin.h>
#include <utils/predicates.h>
#include <utils/algorithm.h>
#include <QMetaObject>
namespace Utils {
enum FoundLicense {
community,
professional,
enterprise
};
FoundLicense checkLicense() {
const ExtensionSystem::PluginSpec *pluginSpec = Utils::findOrDefault(
ExtensionSystem::PluginManager::plugins(),
Utils::equal(&ExtensionSystem::PluginSpec::name, QString("LicenseChecker")));
if (!pluginSpec)
return community;
ExtensionSystem::IPlugin *plugin = pluginSpec->plugin();
if (!plugin)
return community;
bool retVal = false;
bool success = QMetaObject::invokeMethod(plugin,
"qdsEnterpriseLicense",
Qt::DirectConnection,
Q_RETURN_ARG(bool, retVal));
if (success && retVal)
return enterprise;
return professional;
}
} // namespace Utils
@@ -39,9 +39,6 @@
#include <coreplugin/imode.h>
#include <coreplugin/modemanager.h>
#include <extensionsystem/pluginmanager.h>
#include <extensionsystem/pluginspec.h>
#include <projectexplorer/jsonwizard/jsonwizardfactory.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h>
@@ -59,6 +56,7 @@
#include <utils/mimetypes/mimedatabase.h>
#include <utils/stringutils.h>
#include <utils/theme/theme.h>
#include <utils/dynamiclicensecheck.h>
#include <QAbstractListModel>
#include <QApplication>
@@ -302,35 +300,9 @@ private:
void ProjectModel::setupVersion()
{
const ExtensionSystem::PluginSpec *pluginSpec = Utils::findOrDefault(
ExtensionSystem::PluginManager::plugins(),
Utils::equal(&ExtensionSystem::PluginSpec::name, QString("LicenseChecker")));
if (!pluginSpec)
return;
ExtensionSystem::IPlugin *plugin = pluginSpec->plugin();
if (!plugin)
return;
m_communityVersion = false;
bool retVal = false;
bool success = QMetaObject::invokeMethod(plugin,
"qdsEnterpriseLicense",
Qt::DirectConnection,
Q_RETURN_ARG(bool, retVal));
if (!success) {
qWarning("Check for Qt Design Studio Enterprise License failed.");
return;
}
if (!retVal) {
qWarning("No Qt Design Studio Enterprise License. Disabling asset importer.");
return;
}
m_enterpriseVersion = true;
Utils::FoundLicense license = Utils::checkLicense();
m_communityVersion = license == Utils::FoundLicense::community;
m_enterpriseVersion = license == Utils::FoundLicense::enterprise;
}
ProjectModel::ProjectModel(QObject *parent)