Fixed bug with Qt plugins not loading from correct path

bloombloombloom · Sep 27, 2021 · fc6d7df · fc6d7df
1 parent e6d4af5
commit fc6d7df
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/Insight/Insight.cpp b/src/Insight/Insight.cpp
@@ -52,10 +52,6 @@ void Insight::startup() {
 
     auto targetDescriptor = this->targetControllerConsole.getTargetDescriptor();
 
-#ifndef BLOOM_DEBUG_BUILD
-    QCoreApplication::addLibraryPath(QString::fromStdString(Paths::applicationDirPath() + "/plugins"));
-#endif
-
     this->application.setQuitOnLastWindowClosed(true);
     qRegisterMetaType<Bloom::Targets::TargetDescriptor>();
     qRegisterMetaType<Bloom::Targets::TargetPinDescriptor>();

diff --git a/src/Insight/Insight.hpp b/src/Insight/Insight.hpp
@@ -4,12 +4,15 @@
 #include <QApplication>
 
 #include "src/Helpers/Thread.hpp"
-#include "InsightWorker/InsightWorker.hpp"
+#include "src/TargetController/TargetControllerConsole.hpp"
+#include "src/Helpers/Paths.hpp"
 #include "src/ApplicationConfig.hpp"
+
 #include "src/EventManager/EventManager.hpp"
 #include "src/EventManager/EventListener.hpp"
+
+#include "InsightWorker/InsightWorker.hpp"
 #include "UserInterfaces/InsightWindow/InsightWindow.hpp"
-#include "src/TargetController/TargetControllerConsole.hpp"
 
 namespace Bloom
 {
@@ -67,6 +70,9 @@ namespace Bloom
         application(
             (
                 QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, false),
+#ifndef BLOOM_DEBUG_BUILD
+                QCoreApplication::addLibraryPath(QString::fromStdString(Paths::applicationDirPath() + "/plugins")),
+#endif
                 QApplication(this->qtApplicationArgc, this->qtApplicationArgv.data())
             )
         ) {};