Cleanup the lumina-theme-engine subproject

1. Use the built-in OS-detect.pri for build settings
2. Remove the "DISABLE_WIDGETS" flag (desktop always needs it)
3. Clean up the multi-path search routines for qss/color files
4. Add some color files to the default install

1 files changed, 5 insertions, 1 deletions

diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp
index 36b0c2fa..fdeb8966 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp
@@ -6,6 +6,7 @@
 #define LTHEMEENGINE_DATADIR "/usr/local/share"
 #endif
 
+#include <QDebug>
 
 QString lthemeengine::configPath(){
   return QDir::homePath() + "/.config/lthemeengine/";
@@ -46,7 +47,8 @@ QStringList lthemeengine::sharedStyleSheetPath(){
   QStringList dirs;
   dirs << QString(getenv("XDG_CONFIG_HOME"));
   dirs << QString(getenv("XDG_CONFIG_DIRS")).split(":");
-  for(int i=0; i<dirs.length(); i++){ dirs[i].append("/lthemeengine/colors/"); }
+  dirs << QString(getenv("XDG_DATA_DIRS")).split(":");
+  for(int i=0; i<dirs.length(); i++){ dirs[i].append("/lthemeengine/qss/"); }
   if(dirs.isEmpty()){ dirs << LTHEMEENGINE_DATADIR"/lthemeengine/qss/"; } //no XDG settings - use the hardcoded path
   return dirs;
  }
@@ -59,8 +61,10 @@ QStringList lthemeengine::sharedColorSchemePath(){
   QStringList dirs;
   dirs << QString(getenv("XDG_CONFIG_HOME"));
   dirs << QString(getenv("XDG_CONFIG_DIRS")).split(":");
+  dirs << QString(getenv("XDG_DATA_DIRS")).split(":");
   for(int i=0; i<dirs.length(); i++){ dirs[i].append("/lthemeengine/colors/"); }
   if(dirs.isEmpty()){ dirs << LTHEMEENGINE_DATADIR"/lthemeengine/colors/"; } //no XDG settings - use the hardcoded path
+  qDebug() << "Got Color Dirs:" << dirs;
   return dirs;
 }