diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-03-30 09:59:37 +0200 |
|---|---|---|
| committer | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-04-03 10:25:02 +0200 |
| commit | 3436d5345b34be98d75aa9ffd54feb1c731822b3 (patch) | |
| tree | fff54dc8ef03b95d58511f9fbc9bfc86af2c823d | |
| parent | fb6c7409eed98fd30fdfffd28cd2c62cbf6bf268 (diff) | |
| download | qtsensors-3436d5345b34be98d75aa9ffd54feb1c731822b3.tar.gz | |
Resolve a duplicate symbol issue
This was colliding with a similarly named typedef in
`winrtrotationsensor.cpp` and it seems to me that the name should have
been GyrometerReadingHandler in the first place.
This was causing issue for unity build.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I721740caaf994ccf5514cbdc93371a3443378270
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/plugins/sensors/winrt/winrtgyroscope.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/sensors/winrt/winrtgyroscope.cpp b/src/plugins/sensors/winrt/winrtgyroscope.cpp index 479e9d8..c5fff50 100644 --- a/src/plugins/sensors/winrt/winrtgyroscope.cpp +++ b/src/plugins/sensors/winrt/winrtgyroscope.cpp @@ -14,7 +14,7 @@ using namespace Microsoft::WRL::Wrappers; using namespace ABI::Windows::Foundation; using namespace ABI::Windows::Devices::Sensors; -typedef ITypedEventHandler<Gyrometer *, GyrometerReadingChangedEventArgs *> InclinometerReadingHandler; +typedef ITypedEventHandler<Gyrometer *, GyrometerReadingChangedEventArgs *> GyrometerReadingHandler; QT_USE_NAMESPACE @@ -129,8 +129,8 @@ void WinRtGyroscope::start() if (d->token.value) return; - ComPtr<InclinometerReadingHandler> callback = - Callback<InclinometerReadingHandler>(d, &WinRtGyroscopePrivate::readingChanged); + ComPtr<GyrometerReadingHandler> callback = + Callback<GyrometerReadingHandler>(d, &WinRtGyroscopePrivate::readingChanged); HRESULT hr = d->sensor->add_ReadingChanged(callback.Get(), &d->token); if (FAILED(hr)) { |