From ccb66ea64dd6243ab96fc7e65c2f5c9862593fe7 Mon Sep 17 00:00:00 2001
From: Marcus Tillmanns <marcus.tillmanns@qt.io>
Date: Thu, 17 Aug 2023 08:10:57 +0200
Subject: [PATCH] Copilot: Don't use app_version

Change-Id: I10c1bfaa6befe49ba7261afe14c457a5f33c887f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/copilot/CMakeLists.txt    | 2 +-
 src/plugins/copilot/copilot.qbs       | 1 -
 src/plugins/copilot/copilotclient.cpp | 8 ++++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/plugins/copilot/CMakeLists.txt b/src/plugins/copilot/CMakeLists.txt
index 8ae844b8790..f50890d0fd2 100644
--- a/src/plugins/copilot/CMakeLists.txt
+++ b/src/plugins/copilot/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_qtc_plugin(Copilot
-  PLUGIN_DEPENDS Core LanguageClient app_version
+  PLUGIN_DEPENDS Core LanguageClient
   SOURCES
     authwidget.cpp authwidget.h
     copilot.qrc
diff --git a/src/plugins/copilot/copilot.qbs b/src/plugins/copilot/copilot.qbs
index f95f17912a9..6d2b2100472 100644
--- a/src/plugins/copilot/copilot.qbs
+++ b/src/plugins/copilot/copilot.qbs
@@ -7,7 +7,6 @@ QtcPlugin {
     Depends { name: "LanguageClient" }
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
-    Depends { name: "app_version_header" }
     Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
 
     files: [
diff --git a/src/plugins/copilot/copilotclient.cpp b/src/plugins/copilot/copilotclient.cpp
index d5592b7861c..c166e2e37f6 100644
--- a/src/plugins/copilot/copilotclient.cpp
+++ b/src/plugins/copilot/copilotclient.cpp
@@ -6,8 +6,6 @@
 #include "copilotsuggestion.h"
 #include "copilottr.h"
 
-#include <app/app_version.h>
-
 #include <languageclient/languageclientinterface.h>
 #include <languageclient/languageclientmanager.h>
 #include <languageclient/languageclientsettings.h>
@@ -26,6 +24,7 @@
 #include <utils/filepath.h>
 #include <utils/passworddialog.h>
 
+#include <QGuiApplication>
 #include <QInputDialog>
 #include <QLoggingCategory>
 #include <QTimer>
@@ -252,8 +251,9 @@ void CopilotClient::requestSetEditorInfo()
     if (settings().saveProxyPassword())
         currentProxyPassword = settings().proxyPassword();
 
-    const EditorInfo editorInfo{Core::Constants::IDE_VERSION_DISPLAY, "Qt Creator"};
-    const EditorPluginInfo editorPluginInfo{Core::Constants::IDE_VERSION_DISPLAY,
+    const EditorInfo editorInfo{QCoreApplication::applicationVersion(),
+                                QGuiApplication::applicationDisplayName()};
+    const EditorPluginInfo editorPluginInfo{QCoreApplication::applicationVersion(),
                                             "Qt Creator Copilot plugin"};
 
     SetEditorInfoParams params(editorInfo, editorPluginInfo);