summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPier Luigi Fiorini <pierluigi.fiorini@gmail.com>2016-01-06 17:07:14 +0100
committerPier Luigi Fiorini <pierluigi.fiorini@gmail.com>2016-01-11 20:06:13 +0000
commit698acefc207f16fe612c436fdf0f4ec742799aa1 (patch)
tree49ff247a998584efe33fede59e75b7a59f198cfb
parent1d95a31985c29a78d0e7552dac38c8f399dd4493 (diff)
Actually change manufacturer and model
Emit the signal and send the Wayland event to clients. Change-Id: I68a33746057e85bb6606a6217a2cdb890b6a641a Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
-rw-r--r--src/compositor/compositor_api/qwaylandoutput.cpp18
1 files changed, 16 insertions, 2 deletions
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();
}
/*!