diff options
author | Ken Moore <ken@ixsystems.com> | 2018-03-07 15:10:49 -0500 |
---|---|---|
committer | Ken Moore <ken@ixsystems.com> | 2018-03-07 15:10:49 -0500 |
commit | 78fa2f5368ce789f8f1fe63d3de5f43bbb4a9308 (patch) | |
tree | 7e93b470d3a489b7e22abd994c07cb7e8cdf4c18 /src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h | |
parent | Fix a missing library dependency for libXCursor (diff) | |
download | lumina-78fa2f5368ce789f8f1fe63d3de5f43bbb4a9308.tar.gz lumina-78fa2f5368ce789f8f1fe63d3de5f43bbb4a9308.tar.bz2 lumina-78fa2f5368ce789f8f1fe63d3de5f43bbb4a9308.zip |
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.
Diffstat (limited to 'src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h')
-rw-r--r-- | src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h | 8 |
1 files changed, 2 insertions, 6 deletions
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(); |