LARGE UPDATE:

1) Dismantle the Lumina library completely.
2) Setup lots of small subproject files (.pri) for the individual classes within the old library.
3) Move all the Lumina binaries to use the new subproject files
4) Split up the LuminaUtils class/files into LUtils and LDesktopUtils (generic utilities, and desktop-specific utilities)

2 files changed, 9 insertions, 5 deletions

diff --git a/src-qt5/desktop-utils/lumina-terminal/TrayIcon.cpp b/src-qt5/desktop-utils/lumina-terminal/TrayIcon.cpp
index ea970df9..52e15314 100644
--- a/src-qt5/desktop-utils/lumina-terminal/TrayIcon.cpp
+++ b/src-qt5/desktop-utils/lumina-terminal/TrayIcon.cpp
@@ -9,7 +9,7 @@
 #include <QDir>
 #include <QDesktopWidget>
 
-#include <LuminaUtils.h>
+#include <LUtils.h>
 
 TrayIcon::TrayIcon() : QSystemTrayIcon(){
   //Create the child widgets here
@@ -169,4 +169,4 @@ void TrayIcon::TermHidden(){
 
 void TrayIcon::TermVisible(){
   termVisible = true;
-}
\ No newline at end of file
+}
diff --git a/src-qt5/desktop-utils/lumina-terminal/lumina-terminal.pro b/src-qt5/desktop-utils/lumina-terminal/lumina-terminal.pro
index ada7110b..4c623087 100644
--- a/src-qt5/desktop-utils/lumina-terminal/lumina-terminal.pro
+++ b/src-qt5/desktop-utils/lumina-terminal/lumina-terminal.pro
@@ -5,6 +5,12 @@ QT += core gui widgets network
 TARGET  = lumina-terminal
 target.path = $${L_BINDIR}
 
+#include all the special classes from the Lumina tree
+include(../../core/libLumina/LUtils.pri) #includes LUtils
+include(../../core/libLumina/LuminaXDG.pri)
+include(../../core/libLumina/LuminaSingleApplication.pri)
+include(../../core/libLumina/LuminaThemes.pri)
+
 HEADERS	+= TrayIcon.h \
 		TermWindow.h \
 		TerminalWidget.h \
@@ -17,10 +23,8 @@ SOURCES	+= main.cpp \
 		TtyProcess.cpp
 
 
-LIBS += -lLuminaUtils -lncurses
-
+LIBS += -lncurses
 
-DEPENDPATH	+= ../../libLumina
 
 TRANSLATIONS =  i18n/l-terminal_af.ts \
                 i18n/l-terminal_ar.ts \