From 7ab900e41f5f15adccd573d459a80fe60cf6a044 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Mon, 7 Nov 2016 13:52:20 -0500
Subject: 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)

---
 src-qt5/desktop-utils/lumina-textedit/MainUI.cpp          |  2 +-
 src-qt5/desktop-utils/lumina-textedit/PlainTextEditor.cpp |  2 +-
 src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro | 10 ++++++----
 src-qt5/desktop-utils/lumina-textedit/main.cpp            |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src-qt5/desktop-utils/lumina-textedit')

diff --git a/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp b/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp
index c4f4eaca..4a7fbabf 100644
--- a/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-textedit/MainUI.cpp
@@ -10,7 +10,7 @@
 #include "syntaxSupport.h"
 
 #include <LuminaXDG.h>
-#include <LuminaUtils.h>
+#include <LUtils.h>
 
 #include <QFileDialog>
 #include <QDir>
diff --git a/src-qt5/desktop-utils/lumina-textedit/PlainTextEditor.cpp b/src-qt5/desktop-utils/lumina-textedit/PlainTextEditor.cpp
index 99a0ed75..e8eaa007 100644
--- a/src-qt5/desktop-utils/lumina-textedit/PlainTextEditor.cpp
+++ b/src-qt5/desktop-utils/lumina-textedit/PlainTextEditor.cpp
@@ -14,7 +14,7 @@
 #include <QApplication>
 #include <QMessageBox>
 
-#include <LuminaUtils.h>
+#include <LUtils.h>
 
 //==============
 //       PUBLIC
diff --git a/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro b/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro
index 8b46f7b2..3da05dbc 100644
--- a/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro
+++ b/src-qt5/desktop-utils/lumina-textedit/lumina-textedit.pro
@@ -5,6 +5,12 @@ QT += core gui widgets
 TARGET  = lumina-textedit
 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	+= MainUI.h \
 			PlainTextEditor.h \
 			syntaxSupport.h \
@@ -18,10 +24,6 @@ SOURCES	+= main.cpp \
 
 FORMS		+= MainUI.ui \
 			ColorDialog.ui
-LIBS += -lLuminaUtils
-
-
-DEPENDPATH	+= ../../libLumina
 
 TRANSLATIONS =  i18n/l-te_af.ts \
                 i18n/l-te_ar.ts \
diff --git a/src-qt5/desktop-utils/lumina-textedit/main.cpp b/src-qt5/desktop-utils/lumina-textedit/main.cpp
index f4ee02cf..346a6c44 100644
--- a/src-qt5/desktop-utils/lumina-textedit/main.cpp
+++ b/src-qt5/desktop-utils/lumina-textedit/main.cpp
@@ -8,7 +8,7 @@
 #include <QDebug>
 
 #include <LuminaThemes.h>
-#include <LuminaUtils.h>
+#include <LUtils.h>
 
 #include "MainUI.h"
 
-- 
cgit