diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-08 03:00:18 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-08 03:00:18 +0200 |
| commit | 5872f9c94848182ed962f649c67da304df08e53e (patch) | |
| tree | f82827aa632bdc991c95cc3306a0dbebfde1862a /src/plugins/sensors/sensorfw/sensorfwproximitysensor.h | |
| parent | 12bb2552599111aa2f7b6dc69bd0dd565edba710 (diff) | |
| parent | 4ab2e8f086441c06a2dabbd4c62756fc0f029053 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1
Change-Id: Iec09ac237c25be67d604a68b6690f52705edffb3
Diffstat (limited to 'src/plugins/sensors/sensorfw/sensorfwproximitysensor.h')
| -rw-r--r-- | src/plugins/sensors/sensorfw/sensorfwproximitysensor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h index d8b96640..992db84a 100644 --- a/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h +++ b/src/plugins/sensors/sensorfw/sensorfwproximitysensor.h @@ -67,7 +67,7 @@ private: bool firstRun; private slots: - void slotDataAvailable(const Unsigned& data); + void slotReflectanceDataAvailable(const Proximity& data); }; #endif |