diff options
author | Fabian Bumberger <fbumberger@rim.com> | 2013-08-22 17:02:05 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-11 04:24:57 +0100 |
commit | fd619946be51784dc709363324897be6af144c52 (patch) | |
tree | 4add7162e8fae66840e73267935ea4a131997dfa /src/plugins/platforms/qnx/qqnxscreen.h | |
parent | d4ade9d4ef785a96f0bd1a89acfdba8ec09324f6 (diff) |
Refactor QQnxWindow
This patch does following things:
* Remove the root window: First window which is created will serve as a root window
* Allow creation of more than one application window (with every app window having
an own window group) on one screen
* Fixes a bug when reparanting an EGL window
Change-Id: I1afd64a813bc084c0893b958aa191d4a25c32b9d
Reviewed-by: Matt Hoosier <matt.hoosier@garmin.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxscreen.h')
-rw-r--r-- | src/plugins/platforms/qnx/qqnxscreen.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/platforms/qnx/qqnxscreen.h b/src/plugins/platforms/qnx/qqnxscreen.h index 014f7905f3..61c47e6c72 100644 --- a/src/plugins/platforms/qnx/qqnxscreen.h +++ b/src/plugins/platforms/qnx/qqnxscreen.h @@ -44,7 +44,7 @@ #include <qpa/qplatformscreen.h> -#include "qqnxrootwindow.h" +#include "qqnxwindow.h" #include <QtCore/QObject> #include <QtCore/QScopedPointer> @@ -91,10 +91,10 @@ public: void lowerWindow(QQnxWindow *window); void updateHierarchy(); - void onWindowPost(QQnxWindow *window); void adjustOrientation(); - QSharedPointer<QQnxRootWindow> rootWindow() const; + QQnxWindow *rootWindow() const; + void setRootWindow(QQnxWindow*); QPlatformCursor *cursor() const; @@ -126,9 +126,8 @@ private: screen_context_t m_screenContext; screen_display_t m_display; - mutable QSharedPointer<QQnxRootWindow> m_rootWindow; + QQnxWindow *m_rootWindow; const bool m_primaryScreen; - bool m_posted; int m_initialRotation; int m_currentRotation; |