diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2012-03-07 10:12:26 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2012-03-07 10:18:57 +0100 |
| commit | efccc708d4578ff231bba2fba38bbb861dabcbe1 (patch) | |
| tree | bffc182ca16da2d22e0993635632a9c2a4574a02 /src | |
| parent | 28f40671e8ec939ef451746925a9986ea596c616 (diff) | |
Get rid of dummy source update functions and debug output.
The source update callbacks are unnecessary since change
d224714afd087cc73d8 in wayland.
Change-Id: Iac2266621b8739464077d9aa8f9292e06e9b4b35
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/compositor/wayland_wrapper/wlcompositor.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylanddisplay.cpp | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/compositor/wayland_wrapper/wlcompositor.cpp b/src/compositor/wayland_wrapper/wlcompositor.cpp index 6cd9a3dcb..10cf3a8b1 100644 --- a/src/compositor/wayland_wrapper/wlcompositor.cpp +++ b/src/compositor/wayland_wrapper/wlcompositor.cpp @@ -135,7 +135,6 @@ Compositor::Compositor(WaylandCompositor *qt_compositor) , m_retainNotify(0) { compositor = this; - qDebug() << "Compositor instance is" << this; #if defined (QT_COMPOSITOR_WAYLAND_GL) QWindow *window = qt_compositor->window(); diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp index 01af93661..a96d72652 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp +++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp @@ -106,11 +106,6 @@ void QWaylandDisplay::setLastKeyboardFocusInputDevice(QWaylandInputDevice *devic static QWaylandDisplay *display = 0; -static int dummyUpdate(uint32_t, void *) -{ - return 0; -} - QWaylandDisplay::QWaylandDisplay(void) : mLastKeyboardFocusInputDevice(0) , mDndSelectionHandler(0) @@ -130,7 +125,7 @@ QWaylandDisplay::QWaylandDisplay(void) wl_display_add_global_listener(mDisplay, QWaylandDisplay::displayHandleGlobal, this); - mFd = wl_display_get_fd(mDisplay, dummyUpdate, 0); + mFd = wl_display_get_fd(mDisplay, 0, 0); #ifdef QTWAYLAND_EXPERIMENTAL_THREAD_SUPPORT mWritableNotificationFd = wl_display_get_write_notification_fd(mDisplay); |