From 792a7251dcf3e2783dc94e72a4ff9042671b9eeb Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Wed, 4 Jan 2017 20:04:43 +0100 Subject: client: Set screen product information Set QScreen manufacturer and model and set name to the output name rather than the model. Change-Id: I53dfb12d7d992d517885a2c6e9b95abcc57d5117 Reviewed-by: Jan Arne Petersen Reviewed-by: Giulio Camuffo --- src/client/qwaylandscreen.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'src/client/qwaylandscreen.cpp') diff --git a/src/client/qwaylandscreen.cpp b/src/client/qwaylandscreen.cpp index 31d21a1c3..e3d9e7394 100644 --- a/src/client/qwaylandscreen.cpp +++ b/src/client/qwaylandscreen.cpp @@ -89,6 +89,16 @@ QWaylandDisplay * QWaylandScreen::display() const return mWaylandDisplay; } +QString QWaylandScreen::manufacturer() const +{ + return mManufacturer; +} + +QString QWaylandScreen::model() const +{ + return mModel; +} + QRect QWaylandScreen::geometry() const { // Scale geometry for QScreen. This makes window and screen @@ -197,12 +207,11 @@ void QWaylandScreen::output_geometry(int32_t x, int32_t y, int32_t transform) { Q_UNUSED(subpixel); - Q_UNUSED(make); - mTransform = transform; + mManufacturer = make; + mModel = model; - if (!model.isEmpty()) - mOutputName = model; + mTransform = transform; mPhysicalSize = QSize(width, height); mGeometry.moveTopLeft(QPoint(x, y)); -- cgit v1.2.3