diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 10:46:23 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 10:46:23 +0200 |
| commit | 21a2ce41a8efb6c5ab4ab2674458309bc9f031b7 (patch) | |
| tree | 927045bf52f3367551cb4af17aa6b5738408c1bb /src/qt-compositor/hardware_integration/xcomposite_share/xcompositehandler.h | |
| parent | e47eb9057bf08834885ba6ef5e593d6f1844405c (diff) | |
| parent | af711da1389c86c969d4872ec0936a90c46e1343 (diff) | |
Merge branch 'refactor'
Conflicts:
src/qt-compositor/compositor_api/waylandcompositor.cpp
src/qt-compositor/wayland_wrapper/wloutput.cpp
Diffstat (limited to 'src/qt-compositor/hardware_integration/xcomposite_share/xcompositehandler.h')
| -rw-r--r-- | src/qt-compositor/hardware_integration/xcomposite_share/xcompositehandler.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qt-compositor/hardware_integration/xcomposite_share/xcompositehandler.h b/src/qt-compositor/hardware_integration/xcomposite_share/xcompositehandler.h index dc85473..7126e14 100644 --- a/src/qt-compositor/hardware_integration/xcomposite_share/xcompositehandler.h +++ b/src/qt-compositor/hardware_integration/xcomposite_share/xcompositehandler.h @@ -8,7 +8,7 @@ class XCompositeHandler : public Wayland::Object<struct wl_object> { public: - XCompositeHandler(Wayland::Compositor *compositor, Display *display, QWidget *topLevelWidget); + XCompositeHandler(Wayland::Compositor *compositor, Display *display, QWindow *window); void createBuffer(struct wl_client *client, uint32_t id, Window window, const QSize &size, struct wl_visual *visual); static void send_root_information(struct wl_client *client, struct wl_object *global, uint32_t version); @@ -16,8 +16,8 @@ public: private: Wayland::Compositor *mCompositor; - QWidget *mTopLevelWidget; - QWidget *mFakeRootWidget; + QWindow *mwindow; + QWindow *mFakeRootWidget; Display *mDisplay; static void create_buffer(struct wl_client *client, |