From 698acefc207f16fe612c436fdf0f4ec742799aa1 Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Wed, 6 Jan 2016 17:07:14 +0100 Subject: Actually change manufacturer and model Emit the signal and send the Wayland event to clients. Change-Id: I68a33746057e85bb6606a6217a2cdb890b6a641a Reviewed-by: Paul Olav Tvete --- src/compositor/compositor_api/qwaylandoutput.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/compositor/compositor_api/qwaylandoutput.cpp b/src/compositor/compositor_api/qwaylandoutput.cpp index 081393a2c..b9bff6ab4 100644 --- a/src/compositor/compositor_api/qwaylandoutput.cpp +++ b/src/compositor/compositor_api/qwaylandoutput.cpp @@ -358,7 +358,14 @@ QString QWaylandOutput::manufacturer() const void QWaylandOutput::setManufacturer(const QString &manufacturer) { - d_func()->manufacturer = manufacturer; + Q_D(QWaylandOutput); + + if (d->manufacturer == manufacturer) + return; + + d->manufacturer = manufacturer; + d->sendGeometryInfo(); + Q_EMIT manufacturerChanged(); } /*! @@ -379,7 +386,14 @@ QString QWaylandOutput::model() const void QWaylandOutput::setModel(const QString &model) { - d_func()->model = model; + Q_D(QWaylandOutput); + + if (d->model == model) + return; + + d->model = model; + d->sendGeometryInfo(); + Q_EMIT modelChanged(); } /*! -- cgit v1.2.3