From 6cbd6541d5536f59973ba625b267eb8ad64d747b Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Tue, 2 Jan 2018 15:57:56 -0500
Subject: Add the new "DesktopManager" class into lumina2 sources. This is the
 class that watches for settings file changes and/or converts settings into
 interface object values.

---
 src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri')

diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri b/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri
index e4c4faeb..f4a6882d 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri
@@ -1,8 +1,10 @@
 QT *= gui widgets qml quick
 
-SOURCES *= $${PWD}/RootWindow.cpp
+SOURCES *= $${PWD}/RootWindow.cpp \
+		$${PWD}/Desktopmanager.cpp
 
-HEADERS *= $${PWD}/RootWindow.h
+HEADERS *= $${PWD}/RootWindow.h \
+		$${PWD}/DesktopManager.h
 
 #update the includepath so we can just #include as needed without paths
 INCLUDEPATH *= $${PWD}
-- 
cgit 


From 27f1a7177b54f6ec4177ddb11804025740b745a7 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Wed, 10 Jan 2018 23:50:06 -0500
Subject: Get the window compositing/painting routine finished up with a
 seamless image provider system.

---
 src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri')

diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri b/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri
index f4a6882d..ee5ada62 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri
@@ -1,10 +1,12 @@
 QT *= gui widgets qml quick
 
 SOURCES *= $${PWD}/RootWindow.cpp \
-		$${PWD}/Desktopmanager.cpp
+		$${PWD}/Desktopmanager.cpp \
+		$${PWD}/QMLImageProvider.cpp
 
 HEADERS *= $${PWD}/RootWindow.h \
-		$${PWD}/DesktopManager.h
+		$${PWD}/DesktopManager.h \
+		$${PWD}/QMLImageProvider.h
 
 #update the includepath so we can just #include as needed without paths
 INCLUDEPATH *= $${PWD}
-- 
cgit 


From 78fa2f5368ce789f8f1fe63d3de5f43bbb4a9308 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Wed, 7 Mar 2018 15:10:49 -0500
Subject: Split the Lumina 2 backend: Based on a qmake flag, have it use
 QtWidgets or QML for the front-end renderer. This will allow us to import/use
 all the Lumina 1.x interface elements (in Widget form) for now, but switch
 over to QML interface later without losing all the improvements to the
 underling events/communication systems.

---
 .../lumina-desktop-unified/src-desktop/desktop.pri | 35 ++++++++++++++++------
 1 file changed, 26 insertions(+), 9 deletions(-)

(limited to 'src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri')

diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri b/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri
index ee5ada62..89542e23 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri
@@ -1,15 +1,32 @@
-QT *= gui widgets qml quick
+QT *= gui widgets
 
-SOURCES *= $${PWD}/RootWindow.cpp \
-		$${PWD}/Desktopmanager.cpp \
+#update the includepath so we can just #include as needed without paths
+INCLUDEPATH *= $${PWD}
+
+SOURCES *= $${PWD}/Desktopmanager.cpp \
 		$${PWD}/QMLImageProvider.cpp
 
 HEADERS *= $${PWD}/RootWindow.h \
-		$${PWD}/DesktopManager.h \
-		$${PWD}/QMLImageProvider.h
-
-#update the includepath so we can just #include as needed without paths
-INCLUDEPATH *= $${PWD}
+		$${PWD}/DesktopManager.h
 
+#include the base objects
 include($${PWD}/src-cpp/src-cpp.pri)
-include($${PWD}/src-qml/src-qml.pri)
+
+#Now do the QML/Widgets interface switch
+isEmpty(USE_QML){
+  #Widgets-based interface
+  DEFINES += USE_WIDGETS="true"
+
+  SOURCES *= $${PWD}/RootWindow-Widgets.cpp
+
+  include($${PWD}/src-widgets/src-widgets.pri)
+
+}else{
+  #QML-based interface
+  QT *= qml quick
+  DEFINES += USE_QML="true"
+  SOURCES *= $${PWD}/RootWindow-QML.cpp
+  HEADERS *= $${PWD}/QMLImageProvider.h
+
+  include($${PWD}/src-qml/src-qml.pri)
+}
-- 
cgit