doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected EXCLUDE_INSIGHT regressions from moving QApplication into main application class

Browse Source
This commit is contained in:
Nav
2023-06-03 13:10:32 +01:00
parent 47d4a7edaf
commit db04783080
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@@ -50,6 +50,7 @@ set_target_properties(Bloom PROPERTIES OUTPUT_NAME bloom)
find_package(yaml-cpp 0.7.0 REQUIRED) find_package(yaml-cpp 0.7.0 REQUIRED)
find_package(Qt6Core REQUIRED) find_package(Qt6Core REQUIRED)
find_package(Qt6Xml REQUIRED) find_package(Qt6Xml REQUIRED)
find_package(Qt6Network REQUIRED)
if (NOT ${EXCLUDE_INSIGHT}) if (NOT ${EXCLUDE_INSIGHT})
find_package(Qt6Widgets REQUIRED) find_package(Qt6Widgets REQUIRED)
@@ -59,7 +60,6 @@ if (NOT ${EXCLUDE_INSIGHT})
find_package(Qt6Svg REQUIRED) find_package(Qt6Svg REQUIRED)
find_package(Qt6UiTools REQUIRED) find_package(Qt6UiTools REQUIRED)
find_package(Qt6SvgWidgets REQUIRED) find_package(Qt6SvgWidgets REQUIRED)
find_package(Qt6Network REQUIRED)
target_link_libraries(Bloom Qt6::Gui) target_link_libraries(Bloom Qt6::Gui)
target_link_libraries(Bloom Qt6::UiTools) 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::Xml)
target_link_libraries(Bloom Qt6::Svg) target_link_libraries(Bloom Qt6::Svg)
target_link_libraries(Bloom Qt6::SvgWidgets) target_link_libraries(Bloom Qt6::SvgWidgets)
target_link_libraries(Bloom Qt6::Network)
endif() endif()
target_link_libraries(Bloom -lstdc++fs) 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 ${YAML_CPP_LIBRARIES})
target_link_libraries(Bloom Qt6::Core) target_link_libraries(Bloom Qt6::Core)
target_link_libraries(Bloom Qt6::Xml) target_link_libraries(Bloom Qt6::Xml)
target_link_libraries(Bloom Qt6::Network)
target_sources( target_sources(
Bloom Bloom

4
src/Application.cpp
View File

@@ -33,7 +33,11 @@ namespace Bloom
#ifndef BLOOM_DEBUG_BUILD #ifndef BLOOM_DEBUG_BUILD
QCoreApplication::addLibraryPath(QString::fromStdString(Services::PathService::applicationDirPath() + "/plugins")), QCoreApplication::addLibraryPath(QString::fromStdString(Services::PathService::applicationDirPath() + "/plugins")),
#endif #endif
#ifndef EXCLUDE_INSIGHT
QApplication(this->qtApplicationArgc, this->qtApplicationArgv.data()) QApplication(this->qtApplicationArgc, this->qtApplicationArgv.data())
#else
QCoreApplication(this->qtApplicationArgc, this->qtApplicationArgv.data())
#endif
) )
) )
{} {}

7
src/Application.hpp
View File

@@ -6,7 +6,10 @@
#include <optional> #include <optional>
#include <functional> #include <functional>
#include <QtCore/QtCore> #include <QtCore/QtCore>
#include <QCoreApplication>
#ifndef EXCLUDE_INSIGHT
#include <QApplication> #include <QApplication>
#endif
#include <thread> #include <thread>
#include "src/Helpers/Thread.hpp" #include "src/Helpers/Thread.hpp"
@@ -58,7 +61,11 @@ namespace Bloom
std::string qtApplicationName = "Bloom"; std::string qtApplicationName = "Bloom";
std::array<char*, 1> qtApplicationArgv = {this->qtApplicationName.data()}; std::array<char*, 1> qtApplicationArgv = {this->qtApplicationName.data()};
int qtApplicationArgc = 1; int qtApplicationArgc = 1;
#ifndef EXCLUDE_INSIGHT
QApplication qtApplication; QApplication qtApplication;
#else
QCoreApplication qtApplication;
#endif
EventListenerPointer applicationEventListener = std::make_shared<EventListener>("ApplicationEventListener"); EventListenerPointer applicationEventListener = std::make_shared<EventListener>("ApplicationEventListener");