feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Copilot: Don't use app_version

Browse Source 
Change-Id: I10c1bfaa6befe49ba7261afe14c457a5f33c887f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Marcus Tillmanns
2023-08-17 08:10:57 +02:00
parent 62969fe567
commit ccb66ea64d
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/copilot/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_qtc_plugin(Copilot add_qtc_plugin(Copilot
PLUGIN_DEPENDS Core LanguageClient app_version PLUGIN_DEPENDS Core LanguageClient
SOURCES SOURCES
authwidget.cpp authwidget.h authwidget.cpp authwidget.h
copilot.qrc copilot.qrc

1
src/plugins/copilot/copilot.qbs
View File

@@ -7,7 +7,6 @@ QtcPlugin {
Depends { name: "LanguageClient" } Depends { name: "LanguageClient" }
Depends { name: "ProjectExplorer" } Depends { name: "ProjectExplorer" }
Depends { name: "TextEditor" } Depends { name: "TextEditor" }
Depends { name: "app_version_header" }
Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] } Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
files: [ files: [

8
src/plugins/copilot/copilotclient.cpp
View File

@@ -6,8 +6,6 @@
#include "copilotsuggestion.h" #include "copilotsuggestion.h"
#include "copilottr.h" #include "copilottr.h"
#include <app/app_version.h>
#include <languageclient/languageclientinterface.h> #include <languageclient/languageclientinterface.h>
#include <languageclient/languageclientmanager.h> #include <languageclient/languageclientmanager.h>
#include <languageclient/languageclientsettings.h> #include <languageclient/languageclientsettings.h>
@@ -26,6 +24,7 @@
#include <utils/filepath.h> #include <utils/filepath.h>
#include <utils/passworddialog.h> #include <utils/passworddialog.h>
#include <QGuiApplication>
#include <QInputDialog> #include <QInputDialog>
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QTimer> #include <QTimer>
@@ -252,8 +251,9 @@ void CopilotClient::requestSetEditorInfo()
if (settings().saveProxyPassword()) if (settings().saveProxyPassword())
currentProxyPassword = settings().proxyPassword(); currentProxyPassword = settings().proxyPassword();
const EditorInfo editorInfo{Core::Constants::IDE_VERSION_DISPLAY, "Qt Creator"}; const EditorInfo editorInfo{QCoreApplication::applicationVersion(),
const EditorPluginInfo editorPluginInfo{Core::Constants::IDE_VERSION_DISPLAY, QGuiApplication::applicationDisplayName()};
const EditorPluginInfo editorPluginInfo{QCoreApplication::applicationVersion(),
"Qt Creator Copilot plugin"}; "Qt Creator Copilot plugin"};
SetEditorInfoParams params(editorInfo, editorPluginInfo); SetEditorInfoParams params(editorInfo, editorPluginInfo);