diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2022-02-22 11:10:15 +0100 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2022-02-22 16:50:03 +0000 |
| commit | c1c0dab2a9f5eded6fbec9e5adebf27a0bed6fbd (patch) | |
| tree | 92e7c9a8b72719b707916fdd02d7dc496b18ff06 | |
| parent | 872a93447b33149b83397b7bedca4a92d5449773 (diff) | |
| download | qt-creator-c1c0dab2a9f5eded6fbec9e5adebf27a0bed6fbd.tar.gz | |
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>
| -rw-r--r-- | src/libs/utils/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/dynamiclicensecheck.h (renamed from src/libs/utils/dynamiclicensecheck.h) | 2 | ||||
| -rw-r--r-- | src/plugins/studiowelcome/studiowelcomeplugin.cpp | 10 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt index 49e2ab648d..780f3e2017 100644 --- a/src/libs/utils/CMakeLists.txt +++ b/src/libs/utils/CMakeLists.txt @@ -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 diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index 742b6f055c..bee619026a 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -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 diff --git a/src/libs/utils/dynamiclicensecheck.h b/src/plugins/qmldesigner/dynamiclicensecheck.h index 634c6b28d1..8cc7982895 100644 --- a/src/libs/utils/dynamiclicensecheck.h +++ b/src/plugins/qmldesigner/dynamiclicensecheck.h @@ -34,7 +34,7 @@ #include <QMetaObject> -namespace Utils { +namespace QmlDesigner { enum FoundLicense { community, diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp index 72f6afcdb5..8e38dccc6b 100644 --- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp +++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp @@ -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) |