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/core-utils/lumina-search/Worker.cpp        |  2 +-
 src-qt5/core-utils/lumina-search/lumina-search.pro | 10 ++++++----
 src-qt5/core-utils/lumina-search/main.cpp          |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src-qt5/core-utils/lumina-search')

diff --git a/src-qt5/core-utils/lumina-search/Worker.cpp b/src-qt5/core-utils/lumina-search/Worker.cpp
index 0d50d4b8..677d2b4b 100644
--- a/src-qt5/core-utils/lumina-search/Worker.cpp
+++ b/src-qt5/core-utils/lumina-search/Worker.cpp
@@ -2,7 +2,7 @@
 
 #include <QTimer>
 #include <LuminaXDG.h>
-#include <LuminaUtils.h>
+#include <LUtils.h>
 
 Worker::Worker(QObject *parent) : QObject(parent){
   //Get the list of all applications and save them in an easily-searchable form
diff --git a/src-qt5/core-utils/lumina-search/lumina-search.pro b/src-qt5/core-utils/lumina-search/lumina-search.pro
index e42142c6..c0186ce4 100644
--- a/src-qt5/core-utils/lumina-search/lumina-search.pro
+++ b/src-qt5/core-utils/lumina-search/lumina-search.pro
@@ -10,6 +10,12 @@ target.path = $${L_BINDIR}
 
 TEMPLATE = app
 
+#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)
+
 SOURCES += main.cpp \
 		MainUI.cpp \
 		Worker.cpp \
@@ -22,10 +28,6 @@ HEADERS  += MainUI.h \
 FORMS    += MainUI.ui \
 		ConfigUI.ui
 
-LIBS     += -lLuminaUtils
-
-DEPENDPATH	+= ../libLumina
-
 TRANSLATIONS =  i18n/lumina-search_af.ts \
                 i18n/lumina-search_ar.ts \
                 i18n/lumina-search_az.ts \
diff --git a/src-qt5/core-utils/lumina-search/main.cpp b/src-qt5/core-utils/lumina-search/main.cpp
index 5b2b0479..5eee7c32 100644
--- a/src-qt5/core-utils/lumina-search/main.cpp
+++ b/src-qt5/core-utils/lumina-search/main.cpp
@@ -6,7 +6,7 @@
 #include "MainUI.h"
 #include <LuminaOS.h>
 #include <LuminaThemes.h>
-#include <LuminaUtils.h>
+#include <LUtils.h>
 
 //==== INPUT FORMAT ====
 //  lumina-search [-no-excludes] [-dir [directory]] [-search <term>]
-- 
cgit