Core: Move CredentialQuery from Axivion into Core plugin

Change-Id: I9febc0d5f8f141b77435fc0877522791d41aaadd
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>

src/plugins/axivion/CMakeLists.txt

@@ -1,14 +1,13 @@
 add_qtc_plugin(Axivion
   PLUGIN_DEPENDS
     Core Debugger ProjectExplorer TextEditor
-  DEPENDS Qt::Network Qt::Widgets ExtensionSystem Utils qtkeychain
+  DEPENDS Qt::Network Qt::Widgets ExtensionSystem Utils
   SOURCES
     axivion.qrc
     axivionperspective.cpp axivionperspective.h
     axivionplugin.cpp axivionplugin.h
     axivionsettings.cpp axivionsettings.h
     axiviontr.h
-    credentialquery.h credentialquery.cpp
     dashboard/dto.cpp dashboard/dto.h
     dashboard/concat.cpp dashboard/concat.h
     dashboard/error.h dashboard/error.cpp

src/plugins/axivion/axivion.qbs

@@ -9,7 +9,6 @@ QtcPlugin {
     Depends { name: "ProjectExplorer" }
     Depends { name: "TextEditor" }
     Depends { name: "Utils" }
-    Depends { name: "qtkeychain" }
     Depends { name: "Qt.widgets" }
     Depends { name: "Qt.network" }
 
@@ -22,8 +21,6 @@ QtcPlugin {
         "axivionsettings.cpp",
         "axivionsettings.h",
         "axiviontr.h",
-        "credentialquery.cpp",
-        "credentialquery.h",
         "dynamiclistmodel.cpp",
         "dynamiclistmodel.h",
         "issueheaderview.cpp",

src/plugins/axivion/axivionplugin.cpp

@@ -6,10 +6,10 @@
 #include "axivionperspective.h"
 #include "axivionsettings.h"
 #include "axiviontr.h"
-#include "credentialquery.h"
 #include "dashboard/dto.h"
 #include "dashboard/error.h"
 
+#include <coreplugin/credentialquery.h>
 #include <coreplugin/editormanager/documentmodel.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>

src/plugins/coreplugin/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_qtc_plugin(Core
-  DEPENDS Qt::PrintSupport Qt::Qml Qt::Sql Qt::Gui Qt::GuiPrivate TerminalLib
+  DEPENDS Qt::PrintSupport Qt::Qml Qt::Sql Qt::Gui Qt::GuiPrivate TerminalLib qtkeychain
   PUBLIC_DEPENDS Aggregation ExtensionSystem Utils
   SOURCES
     actionmanager/actioncontainer.cpp
@@ -29,6 +29,8 @@ add_qtc_plugin(Core
     coreplugin.cpp
     coreplugin.h
     coreplugintr.h
+    credentialquery.cpp
+    credentialquery.h
     designmode.cpp
     designmode.h
     dialogs/addtovcsdialog.cpp

src/plugins/coreplugin/coreplugin.qbs

@@ -16,6 +16,7 @@ QtcPlugin {
     Depends { name: "Utils" }
     Depends { name: "Aggregation" }
     Depends { name: "TerminalLib" }
+    Depends { name: "qtkeychain" }
 
     cpp.dynamicLibraries: {
         if (qbs.targetOS.contains("windows"))
@@ -43,6 +44,8 @@ QtcPlugin {
             "coreplugin.cpp",
             "coreplugin.h",
             "coreplugintr.h",
+            "credentialquery.cpp",
+            "credentialquery.h",
             "designmode.cpp",
             "designmode.h",
             "diffservice.cpp",

src/plugins/coreplugin/credentialquery.cpp

@@ -8,7 +8,7 @@
 using namespace QKeychain;
 using namespace Tasking;
 
-namespace Axivion::Internal {
+namespace Core {
 
 CredentialQueryTaskAdapter::~CredentialQueryTaskAdapter() = default;
 
@@ -51,4 +51,4 @@ void CredentialQueryTaskAdapter::start()
     job->start();
 }
 
-} // Axivion::Internal
+} // Core

src/plugins/coreplugin/credentialquery.h

@@ -3,13 +3,15 @@
 
 #pragma once
 
+#include "core_global.h"
+
 #include <solutions/tasking/tasktree.h>
 
-namespace Axivion::Internal {
+namespace Core {
 
 enum class CredentialOperation { Get, Set, Delete };
 
-class CredentialQuery
+class CORE_EXPORT CredentialQuery
 {
 public:
     void setOperation(CredentialOperation operation) { m_operation = operation; }
@@ -30,7 +32,7 @@ private:
     friend class CredentialQueryTaskAdapter;
 };
 
-class CredentialQueryTaskAdapter final : public Tasking::TaskAdapter<CredentialQuery>
+class CORE_EXPORT CredentialQueryTaskAdapter final : public Tasking::TaskAdapter<CredentialQuery>
 {
 private:
     ~CredentialQueryTaskAdapter();
@@ -40,4 +42,4 @@ private:
 
 using CredentialQueryTask = Tasking::CustomTask<CredentialQueryTaskAdapter>;
 
-} // Axivion::Internal
+} // Core