forked from qt-creator/qt-creator
Move dynamiclicensecheck.h to QmlDesigner
Change-Id: Ic49a18a6ed164d3878e69d157edd83773c93959c Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
@@ -34,7 +34,6 @@ 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
|
||||
|
||||
@@ -32,6 +32,7 @@ add_qtc_plugin(QmlDesigner
|
||||
cmakegeneratordialogtreemodel.cpp cmakegeneratordialogtreemodel.h
|
||||
cmakeprojectconverter.cpp cmakeprojectconverter.h
|
||||
cmakeprojectconverterdialog.cpp cmakeprojectconverterdialog.h
|
||||
dynamiclicensecheck.h
|
||||
generateresource.cpp generateresource.h
|
||||
generatecmakelists.cpp generatecmakelists.h
|
||||
generatecmakelistsconstants.h
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@
|
||||
|
||||
#include <QMetaObject>
|
||||
|
||||
namespace Utils {
|
||||
namespace QmlDesigner {
|
||||
|
||||
enum FoundLicense {
|
||||
community,
|
||||
@@ -46,8 +46,9 @@
|
||||
|
||||
#include <qmlprojectmanager/qmlproject.h>
|
||||
|
||||
#include <qmldesigner/qmldesignerplugin.h>
|
||||
#include <qmldesigner/components/componentcore/theme.h>
|
||||
#include <qmldesigner/dynamiclicensecheck.h>
|
||||
#include <qmldesigner/qmldesignerplugin.h>
|
||||
|
||||
#include <utils/checkablemessagebox.h>
|
||||
#include <utils/hostosinfo.h>
|
||||
@@ -56,7 +57,6 @@
|
||||
#include <utils/mimetypes/mimedatabase.h>
|
||||
#include <utils/stringutils.h>
|
||||
#include <utils/theme/theme.h>
|
||||
#include <utils/dynamiclicensecheck.h>
|
||||
|
||||
#include <QAbstractListModel>
|
||||
#include <QApplication>
|
||||
@@ -300,9 +300,9 @@ private:
|
||||
|
||||
void ProjectModel::setupVersion()
|
||||
{
|
||||
Utils::FoundLicense license = Utils::checkLicense();
|
||||
m_communityVersion = license == Utils::FoundLicense::community;
|
||||
m_enterpriseVersion = license == Utils::FoundLicense::enterprise;
|
||||
QmlDesigner::FoundLicense license = QmlDesigner::checkLicense();
|
||||
m_communityVersion = license == QmlDesigner::FoundLicense::community;
|
||||
m_enterpriseVersion = license == QmlDesigner::FoundLicense::enterprise;
|
||||
}
|
||||
|
||||
ProjectModel::ProjectModel(QObject *parent)
|
||||
|
||||
Reference in New Issue
Block a user