From db04783080b50fedbf3ab95605956a567df987ac Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Sat, 3 Jun 2023 13:10:32 +0100
Subject: [PATCH] Corrected `EXCLUDE_INSIGHT` regressions from moving
 QApplication into main application class

---
 CMakeLists.txt      | 4 ++--
 src/Application.cpp | 6 +++++-
 src/Application.hpp | 7 +++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8adc8a59..c4bd5b5a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,6 +50,7 @@ set_target_properties(Bloom PROPERTIES OUTPUT_NAME bloom)
 find_package(yaml-cpp 0.7.0 REQUIRED)
 find_package(Qt6Core REQUIRED)
 find_package(Qt6Xml REQUIRED)
+find_package(Qt6Network REQUIRED)
 
 if (NOT ${EXCLUDE_INSIGHT})
     find_package(Qt6Widgets REQUIRED)
@@ -59,7 +60,6 @@ if (NOT ${EXCLUDE_INSIGHT})
     find_package(Qt6Svg REQUIRED)
     find_package(Qt6UiTools REQUIRED)
     find_package(Qt6SvgWidgets REQUIRED)
-    find_package(Qt6Network REQUIRED)
 
     target_link_libraries(Bloom Qt6::Gui)
     target_link_libraries(Bloom Qt6::UiTools)
@@ -67,7 +67,6 @@ if (NOT ${EXCLUDE_INSIGHT})
     target_link_libraries(Bloom Qt6::Xml)
     target_link_libraries(Bloom Qt6::Svg)
     target_link_libraries(Bloom Qt6::SvgWidgets)
-    target_link_libraries(Bloom Qt6::Network)
 endif()
 
 target_link_libraries(Bloom -lstdc++fs)
@@ -78,6 +77,7 @@ target_link_libraries(Bloom -lprocps)
 target_link_libraries(Bloom ${YAML_CPP_LIBRARIES})
 target_link_libraries(Bloom Qt6::Core)
 target_link_libraries(Bloom Qt6::Xml)
+target_link_libraries(Bloom Qt6::Network)
 
 target_sources(
     Bloom
diff --git a/src/Application.cpp b/src/Application.cpp
index 37f68d2a..38411871 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -33,7 +33,11 @@ namespace Bloom
 #ifndef BLOOM_DEBUG_BUILD
                 QCoreApplication::addLibraryPath(QString::fromStdString(Services::PathService::applicationDirPath() + "/plugins")),
 #endif
-                QApplication(this->qtApplicationArgc, this->qtApplicationArgv.data())
+#ifndef EXCLUDE_INSIGHT
+                    QApplication(this->qtApplicationArgc, this->qtApplicationArgv.data())
+#else
+                    QCoreApplication(this->qtApplicationArgc, this->qtApplicationArgv.data())
+#endif
             )
         )
     {}
diff --git a/src/Application.hpp b/src/Application.hpp
index 1800398c..d10cb7e6 100644
--- a/src/Application.hpp
+++ b/src/Application.hpp
@@ -6,7 +6,10 @@
 #include <optional>
 #include <functional>
 #include <QtCore/QtCore>
+#include <QCoreApplication>
+#ifndef EXCLUDE_INSIGHT
 #include <QApplication>
+#endif
 #include <thread>
 
 #include "src/Helpers/Thread.hpp"
@@ -58,7 +61,11 @@ namespace Bloom
         std::string qtApplicationName = "Bloom";
         std::array<char*, 1> qtApplicationArgv = {this->qtApplicationName.data()};
         int qtApplicationArgc = 1;
+#ifndef EXCLUDE_INSIGHT
         QApplication qtApplication;
+#else
+        QCoreApplication qtApplication;
+#endif
 
         EventListenerPointer applicationEventListener = std::make_shared<EventListener>("ApplicationEventListener");