From ac7ce758b6b787e689ee20e86958edc65b07680f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Samuel=20R=C3=B8dal?= Date: Fri, 13 Jan 2012 13:58:53 +0100 Subject: [PATCH] Adapted to new orientation API in qtbase. Change-Id: I455d06a364a89b6558ab00b15d9541ea397adcd5 Sanity-Review: Qt Sanity Bot Reviewed-by: Lars Knoll --- src/compositor/wayland_wrapper/wlcompositor.cpp | 2 +- src/plugins/platforms/wayland/qwaylandextendedoutput.cpp | 2 +- src/plugins/platforms/wayland/qwaylandscreen.cpp | 4 ++-- src/plugins/platforms/wayland/qwaylandscreen.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/compositor/wayland_wrapper/wlcompositor.cpp b/src/compositor/wayland_wrapper/wlcompositor.cpp index c221540..9dc44ae 100644 --- a/src/compositor/wayland_wrapper/wlcompositor.cpp +++ b/src/compositor/wayland_wrapper/wlcompositor.cpp @@ -109,7 +109,7 @@ Compositor::Compositor(WaylandCompositor *qt_compositor) , m_current_frame(0) , m_last_queued_buf(-1) , m_qt_compositor(qt_compositor) - , m_orientation(Qt::UnknownOrientation) + , m_orientation(Qt::PrimaryOrientation) , m_directRenderSurface(0) #if defined (QT_COMPOSITOR_WAYLAND_GL) , m_graphics_hw_integration(0) diff --git a/src/plugins/platforms/wayland/qwaylandextendedoutput.cpp b/src/plugins/platforms/wayland/qwaylandextendedoutput.cpp index 4020b0d..c8ecf2f 100644 --- a/src/plugins/platforms/wayland/qwaylandextendedoutput.cpp +++ b/src/plugins/platforms/wayland/qwaylandextendedoutput.cpp @@ -76,7 +76,7 @@ QWaylandExtendedOutput *QWaylandOutputExtension::getExtendedOutput(QWaylandScree QWaylandExtendedOutput::QWaylandExtendedOutput(QWaylandScreen *screen, wl_extended_output *extended_output) : m_extended_output(extended_output) , m_screen(screen) - , m_orientation(m_screen->primaryOrientation()) + , m_orientation(m_screen->orientation()) { wl_extended_output_add_listener(m_extended_output,&extended_output_listener,this); } diff --git a/src/plugins/platforms/wayland/qwaylandscreen.cpp b/src/plugins/platforms/wayland/qwaylandscreen.cpp index 6a2839a..8ec88df 100644 --- a/src/plugins/platforms/wayland/qwaylandscreen.cpp +++ b/src/plugins/platforms/wayland/qwaylandscreen.cpp @@ -88,11 +88,11 @@ QImage::Format QWaylandScreen::format() const return mFormat; } -Qt::ScreenOrientation QWaylandScreen::currentOrientation() const +Qt::ScreenOrientation QWaylandScreen::orientation() const { if (mExtendedOutput) return mExtendedOutput->currentOrientation(); - return primaryOrientation(); + return QPlatformScreen::orientation(); } QWaylandExtendedOutput *QWaylandScreen::extendedOutput() const diff --git a/src/plugins/platforms/wayland/qwaylandscreen.h b/src/plugins/platforms/wayland/qwaylandscreen.h index af81176..90e713e 100644 --- a/src/plugins/platforms/wayland/qwaylandscreen.h +++ b/src/plugins/platforms/wayland/qwaylandscreen.h @@ -60,7 +60,7 @@ public: int depth() const; QImage::Format format() const; - Qt::ScreenOrientation currentOrientation() const; + Qt::ScreenOrientation orientation() const; wl_output *output() const { return mOutput; } -- 2.7.4