From 8687a43803e0d5937ff5213ab987b05866498362 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Thu, 3 Aug 2017 10:48:19 -0400
Subject: 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

---
 src-qt5/core/lumina-theme-engine/lthemeengine.pro | 52 ++++-------------------
 1 file changed, 8 insertions(+), 44 deletions(-)

(limited to 'src-qt5/core/lumina-theme-engine/lthemeengine.pro')

diff --git a/src-qt5/core/lumina-theme-engine/lthemeengine.pro b/src-qt5/core/lumina-theme-engine/lthemeengine.pro
index e3cb47b1..8bad53f6 100644
--- a/src-qt5/core/lumina-theme-engine/lthemeengine.pro
+++ b/src-qt5/core/lumina-theme-engine/lthemeengine.pro
@@ -1,59 +1,23 @@
-QT       += core gui widgets x11extras network
+QT       *= core gui widgets x11extras network
 !isEqual (QT_MAJOR_VERSION, 5) {
   error("Use Qt 5.4.0 or higher.")
 }
+include(../../OS-detect.pri)
 
-QMAKE_DISTCLEAN += -r .build
-
-CONFIG += c++11
+CONFIG *= c++11
 
 desktop.files=src/lthemeengine/ltheme.desktop
 desktop.path=$${L_SHAREDIR}/applications/
                 
 #Install paths
-unix {
-  isEmpty(PREFIX) {
-    PREFIX = /usr/local
-  }
-  isEmpty(PLUGINDIR) {
-    PLUGINDIR = $$[QT_INSTALL_PLUGINS]
-  }
-
-  BINDIR = $$PREFIX/bin
-  DATADIR = $$PREFIX/share
-
-  DEFINES += LTHEMEENGINE_DATADIR=\\\"$$DATADIR\\\"
-}
+  PLUGINDIR = $${DISTDIR}$$[QT_INSTALL_PLUGINS]
+  DEFINES += LTHEMEENGINE_DATADIR=\\\"$$L_SHAREDIR\\\"
 
 TEMPLATE = subdirs
 
 SUBDIRS += src/lthemeengine-qtplugin src/lthemeengine-style src/lthemeengine
 
-unix:exists($$[QT_INSTALL_BINS]/lrelease){
-LRELEASE_EXECUTABLE = $$[QT_INSTALL_BINS]/lrelease
-}
-
-unix:exists($$[QT_INSTALL_BINS]/lrelease-qt5){
-LRELEASE_EXECUTABLE = $$[QT_INSTALL_BINS]/lrelease-qt5
-}
-
-
-isEmpty(LRELEASE_EXECUTABLE){
-error(Could not find lrelease executable)
-}
-else {
-message(Found lrelease executable: $$LRELEASE_EXECUTABLE)
-}
-
-message (PREFIX=$$PREFIX)
-message (BINDIR=$$BINDIR)
-message (DATADIR=$$DATADIR)
-message (PLUGINDIR=$$PLUGINDIR)
-equals (DISABLE_WIDGETS,1):message ("QtWidgets are disabled!")
-
-#Some conf to redirect intermediate stuff in separate dirs
-UI_DIR=./.build/ui/
-MOC_DIR=./.build/moc/
-OBJECTS_DIR=./.build/obj
-RCC_DIR=./.build/rcc
+colors.files = colors/*.conf
+colors.path = $${L_SHAREDIR}/lthemeengine/colors
 
+INSTALLS += colors
-- 
cgit 


From 9787abdd5bc1378c7252ae710dc58ad582b447df Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Thu, 3 Aug 2017 12:25:14 -0400
Subject: Fix up a bit more of the lumina-theme-engine 1. Adjust the build
 directories for all projects 2. Add lumina-theme-engine to the "core"
 meta-project 3. flip the names of the "dusk" and "darker" color schemes 4.
 Add a simple drop-down menu for standard colors when editing a stylesheet 5.
 Ensure the find colors/qss routines skip duplicate directory entries

---
 src-qt5/core/lumina-theme-engine/lthemeengine.pro | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 src-qt5/core/lumina-theme-engine/lthemeengine.pro

(limited to 'src-qt5/core/lumina-theme-engine/lthemeengine.pro')

diff --git a/src-qt5/core/lumina-theme-engine/lthemeengine.pro b/src-qt5/core/lumina-theme-engine/lthemeengine.pro
deleted file mode 100644
index 8bad53f6..00000000
--- a/src-qt5/core/lumina-theme-engine/lthemeengine.pro
+++ /dev/null
@@ -1,23 +0,0 @@
-QT       *= core gui widgets x11extras network
-!isEqual (QT_MAJOR_VERSION, 5) {
-  error("Use Qt 5.4.0 or higher.")
-}
-include(../../OS-detect.pri)
-
-CONFIG *= c++11
-
-desktop.files=src/lthemeengine/ltheme.desktop
-desktop.path=$${L_SHAREDIR}/applications/
-                
-#Install paths
-  PLUGINDIR = $${DISTDIR}$$[QT_INSTALL_PLUGINS]
-  DEFINES += LTHEMEENGINE_DATADIR=\\\"$$L_SHAREDIR\\\"
-
-TEMPLATE = subdirs
-
-SUBDIRS += src/lthemeengine-qtplugin src/lthemeengine-style src/lthemeengine
-
-colors.files = colors/*.conf
-colors.path = $${L_SHAREDIR}/lthemeengine/colors
-
-INSTALLS += colors
-- 
cgit