From 78fa2f5368ce789f8f1fe63d3de5f43bbb4a9308 Mon Sep 17 00:00:00 2001 From: Ken Moore 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. --- src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h') diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h b/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h index 41c75a46..3c7414f2 100644 --- a/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h +++ b/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h @@ -1,6 +1,6 @@ //=========================================== // Lumina-desktop source code -// Copyright (c) 2017, Ken Moore +// Copyright (c) 2017-2018, Ken Moore // Available under the 3-clause BSD license // See the LICENSE file for full details //=========================================== @@ -13,7 +13,6 @@ class RootWindow : public QObject{ Q_OBJECT private: QWindow *root_win; - QQuickView *root_view; RootDesktopObject *root_obj; public: @@ -22,10 +21,7 @@ public: void start(); - WId viewID(){ - if(root_view->parent()!=0){ return root_view->parent()->winId(); } - return root_view->winId(); - } + WId viewID(); public slots: void syncRootSize(); -- cgit