diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2023-06-21 15:12:46 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2023-06-26 06:57:46 +0000 |
| commit | dff9e1463bfebe803af0c696222b6eeb04857c26 (patch) | |
| tree | 71a130bb73c65d88c0e87fdd06d0f06495c6670c /src/plugins/cppeditor | |
| parent | 27302694ab794d8437b6feac4095ad34fa43ed24 (diff) | |
Reduce usage of app_version header
Most information is available via Q(Core|Gui)Application.
Add an AppInfo structure for the things that are not.
This avoids that the information ends up duplicated and
hardcoded in the plugins, which is not needed or desired.
Change-Id: I4d565e75c42a7b8facafa90c27096ea49359215d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/plugins/cppeditor')
| -rw-r--r-- | src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/cppeditor/cppcodemodelinspectordumper.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/cppeditor/cppeditor.qbs | 2 | ||||
| -rw-r--r-- | src/plugins/cppeditor/cppfilesettingspage.cpp | 5 |
4 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp index efcbd51569..4cc69fe439 100644 --- a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp +++ b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp @@ -13,7 +13,6 @@ #include "cpptoolsreuse.h" #include "symbolfinder.h" -#include <app/app_version.h> #include <coreplugin/messagemanager.h> #include <texteditor/basehoverhandler.h> #include <utils/qtcassert.h> diff --git a/src/plugins/cppeditor/cppcodemodelinspectordumper.cpp b/src/plugins/cppeditor/cppcodemodelinspectordumper.cpp index 2a6dfb6e1e..e2c879b183 100644 --- a/src/plugins/cppeditor/cppcodemodelinspectordumper.cpp +++ b/src/plugins/cppeditor/cppcodemodelinspectordumper.cpp @@ -8,7 +8,6 @@ #include "cpptoolsreuse.h" #include "cppworkingcopy.h" -#include <app/app_version.h> #include <coreplugin/icore.h> #include <projectexplorer/projectmacro.h> #include <projectexplorer/project.h> diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs index b7d2aea031..4e36279580 100644 --- a/src/plugins/cppeditor/cppeditor.qbs +++ b/src/plugins/cppeditor/cppeditor.qbs @@ -13,8 +13,6 @@ QtcPlugin { Depends { name: "TextEditor" } Depends { name: "ProjectExplorer" } - Depends { name: "app_version_header" } - pluginTestDepends: [ "QmakeProjectManager", "QbsProjectManager", diff --git a/src/plugins/cppeditor/cppfilesettingspage.cpp b/src/plugins/cppeditor/cppfilesettingspage.cpp index 21411577d3..6b9bad8c9c 100644 --- a/src/plugins/cppeditor/cppfilesettingspage.cpp +++ b/src/plugins/cppeditor/cppfilesettingspage.cpp @@ -6,7 +6,6 @@ #include "cppeditorplugin.h" #include "cppeditortr.h" -#include <app/app_version.h> #include <coreplugin/icore.h> #include <coreplugin/editormanager/editormanager.h> #include <projectexplorer/project.h> @@ -20,6 +19,7 @@ #include <QComboBox> #include <QCoreApplication> #include <QFile> +#include <QGuiApplication> #include <QLineEdit> #include <QLocale> #include <QSettings> @@ -435,7 +435,8 @@ void CppFileSettingsWidget::slotEdit() if (path.isEmpty()) return; FileSaver saver(path, QIODevice::Text); - saver.write(Tr::tr(licenseTemplateTemplate).arg(Core::Constants::IDE_DISPLAY_NAME).toUtf8()); + saver.write( + Tr::tr(licenseTemplateTemplate).arg(QGuiApplication::applicationDisplayName()).toUtf8()); if (!saver.finalize(this)) return; setLicenseTemplatePath(path); |