diff options
author | Alexey Edelev <alexey.edelev@qt.io> | 2023-11-23 11:47:35 +0100 |
---|---|---|
committer | Alexey Edelev <alexey.edelev@qt.io> | 2023-12-14 09:13:07 +0100 |
commit | 475ad6de14c284946abe3dff3bbc0b868ef4aeb7 (patch) | |
tree | d47f2e0cb2b9f8a6507609eacb1eb158b82cc08f | |
parent | 90342b0956daf655a1aa5609cfddf7ca6e60ec52 (diff) |
Remove the use of Q_SENSORSQUICK_PRIVATE_EXPORT
Task-number: QTBUG-117983
Change-Id: I8360b44a9074fa8ad0cb99a95ff032a1e1f77c39
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
21 files changed, 41 insertions, 41 deletions
diff --git a/src/sensors/make_sensor.pl b/src/sensors/make_sensor.pl index c314c1bd..71e1f675 100755 --- a/src/sensors/make_sensor.pl +++ b/src/sensors/make_sensor.pl @@ -82,7 +82,7 @@ QT_BEGIN_NAMESPACE class '.$sensor.'; -class Q_SENSORSQUICK_PRIVATE_EXPORT '.$qmlsensor.' : public QmlSensor +class Q_SENSORSQUICK_EXPORT '.$qmlsensor.' : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT('.$no_q_sensor.') @@ -99,7 +99,7 @@ private: '.$sensor.' *m_sensor; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT '.$qmlreading.' : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT '.$qmlreading.' : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal myprop READ myprop NOTIFY mypropChanged BINDABLE bindableMyprop) diff --git a/src/sensorsquick/qmlaccelerometer_p.h b/src/sensorsquick/qmlaccelerometer_p.h index 862aadde..aae90879 100644 --- a/src/sensorsquick/qmlaccelerometer_p.h +++ b/src/sensorsquick/qmlaccelerometer_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE class QAccelerometer; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAccelerometer : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlAccelerometer : public QmlSensor { Q_OBJECT Q_PROPERTY(AccelerationMode accelerationMode READ accelerationMode WRITE setAccelerationMode @@ -53,7 +53,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAccelerometerReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlAccelerometerReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal x READ x NOTIFY xChanged BINDABLE bindableX) diff --git a/src/sensorsquick/qmlambientlightsensor_p.h b/src/sensorsquick/qmlambientlightsensor_p.h index 5c41f56b..83bcd60c 100644 --- a/src/sensorsquick/qmlambientlightsensor_p.h +++ b/src/sensorsquick/qmlambientlightsensor_p.h @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE class QAmbientLightSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAmbientLightSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlAmbientLightSensor : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(AmbientLightSensor) @@ -39,7 +39,7 @@ private: }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAmbientLightSensorReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlAmbientLightSensorReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(QAmbientLightReading::LightLevel lightLevel READ lightLevel diff --git a/src/sensorsquick/qmlambienttemperaturesensor_p.h b/src/sensorsquick/qmlambienttemperaturesensor_p.h index 9d17983a..898c0617 100644 --- a/src/sensorsquick/qmlambienttemperaturesensor_p.h +++ b/src/sensorsquick/qmlambienttemperaturesensor_p.h @@ -20,7 +20,7 @@ QT_BEGIN_NAMESPACE class QAmbientTemperatureSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAmbientTemperatureSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlAmbientTemperatureSensor : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(AmbientTemperatureSensor) @@ -37,7 +37,7 @@ private: QAmbientTemperatureSensor *m_sensor; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlAmbientTemperatureReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlAmbientTemperatureReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal temperature READ temperature diff --git a/src/sensorsquick/qmlcompass_p.h b/src/sensorsquick/qmlcompass_p.h index 77f401ef..312bf13c 100644 --- a/src/sensorsquick/qmlcompass_p.h +++ b/src/sensorsquick/qmlcompass_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE class QCompass; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlCompass : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlCompass : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(Compass) @@ -37,7 +37,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlCompassReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlCompassReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal azimuth READ azimuth NOTIFY azimuthChanged BINDABLE bindableAzimuth) diff --git a/src/sensorsquick/qmlgyroscope_p.h b/src/sensorsquick/qmlgyroscope_p.h index b4e508cf..02697718 100644 --- a/src/sensorsquick/qmlgyroscope_p.h +++ b/src/sensorsquick/qmlgyroscope_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE class QGyroscope; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlGyroscope : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlGyroscope : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(Gyroscope) @@ -37,7 +37,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlGyroscopeReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlGyroscopeReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal x READ x NOTIFY xChanged BINDABLE bindableX) diff --git a/src/sensorsquick/qmlhumiditysensor_p.h b/src/sensorsquick/qmlhumiditysensor_p.h index c4f57152..e01b0dc3 100644 --- a/src/sensorsquick/qmlhumiditysensor_p.h +++ b/src/sensorsquick/qmlhumiditysensor_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE class QHumiditySensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlHumiditySensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlHumiditySensor : public QmlSensor { Q_OBJECT @@ -39,7 +39,7 @@ private: QHumiditySensor *m_sensor; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlHumidityReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlHumidityReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal relativeHumidity READ relativeHumidity diff --git a/src/sensorsquick/qmlirproximitysensor_p.h b/src/sensorsquick/qmlirproximitysensor_p.h index 5684641e..b1f97d5d 100644 --- a/src/sensorsquick/qmlirproximitysensor_p.h +++ b/src/sensorsquick/qmlirproximitysensor_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE class QIRProximitySensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlIRProximitySensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlIRProximitySensor : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(IRProximitySensor) @@ -37,7 +37,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlIRProximitySensorReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlIRProximitySensorReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal reflectance READ reflectance diff --git a/src/sensorsquick/qmllidsensor_p.h b/src/sensorsquick/qmllidsensor_p.h index 2453ac43..1ddf60a9 100644 --- a/src/sensorsquick/qmllidsensor_p.h +++ b/src/sensorsquick/qmllidsensor_p.h @@ -20,7 +20,7 @@ QT_BEGIN_NAMESPACE class QLidSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlLidSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlLidSensor : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(LidSensor) @@ -37,7 +37,7 @@ private: QLidSensor *m_sensor; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlLidReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlLidReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(bool backLidClosed READ backLidClosed diff --git a/src/sensorsquick/qmllightsensor_p.h b/src/sensorsquick/qmllightsensor_p.h index b9c27fb6..6758ffba 100644 --- a/src/sensorsquick/qmllightsensor_p.h +++ b/src/sensorsquick/qmllightsensor_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE class QLightSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlLightSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlLightSensor : public QmlSensor { Q_OBJECT Q_PROPERTY(qreal fieldOfView READ fieldOfView NOTIFY fieldOfViewChanged) @@ -42,7 +42,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlLightSensorReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlLightSensorReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal illuminance READ illuminance diff --git a/src/sensorsquick/qmlmagnetometer_p.h b/src/sensorsquick/qmlmagnetometer_p.h index ffd65825..9080f3e7 100644 --- a/src/sensorsquick/qmlmagnetometer_p.h +++ b/src/sensorsquick/qmlmagnetometer_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE class QMagnetometer; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlMagnetometer : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlMagnetometer : public QmlSensor { Q_OBJECT Q_PROPERTY(bool returnGeoValues READ returnGeoValues WRITE setReturnGeoValues NOTIFY returnGeoValuesChanged) @@ -44,7 +44,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlMagnetometerReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlMagnetometerReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal x READ x NOTIFY xChanged BINDABLE bindableX) diff --git a/src/sensorsquick/qmlorientationsensor_p.h b/src/sensorsquick/qmlorientationsensor_p.h index 3097c448..9be7b7e5 100644 --- a/src/sensorsquick/qmlorientationsensor_p.h +++ b/src/sensorsquick/qmlorientationsensor_p.h @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE class QOrientationSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlOrientationSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlOrientationSensor : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(OrientationSensor) @@ -38,7 +38,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlOrientationSensorReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlOrientationSensorReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(QOrientationReading::Orientation orientation READ orientation diff --git a/src/sensorsquick/qmlpressuresensor_p.h b/src/sensorsquick/qmlpressuresensor_p.h index 5c94cf47..8b531fba 100644 --- a/src/sensorsquick/qmlpressuresensor_p.h +++ b/src/sensorsquick/qmlpressuresensor_p.h @@ -20,7 +20,7 @@ QT_BEGIN_NAMESPACE class QPressureSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlPressureSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlPressureSensor : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(PressureSensor) @@ -37,7 +37,7 @@ private: QPressureSensor *m_sensor; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlPressureReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlPressureReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal pressure READ pressure NOTIFY pressureChanged BINDABLE bindablePressure) diff --git a/src/sensorsquick/qmlproximitysensor_p.h b/src/sensorsquick/qmlproximitysensor_p.h index 570d24c5..8ce4fdb8 100644 --- a/src/sensorsquick/qmlproximitysensor_p.h +++ b/src/sensorsquick/qmlproximitysensor_p.h @@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE class QProximitySensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlProximitySensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlProximitySensor : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(ProximitySensor) @@ -39,7 +39,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlProximitySensorReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlProximitySensorReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(bool near READ near NOTIFY nearChanged BINDABLE bindableNear) diff --git a/src/sensorsquick/qmlrotationsensor_p.h b/src/sensorsquick/qmlrotationsensor_p.h index 6699ec17..1ef008b8 100644 --- a/src/sensorsquick/qmlrotationsensor_p.h +++ b/src/sensorsquick/qmlrotationsensor_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE class QRotationSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlRotationSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlRotationSensor : public QmlSensor { Q_OBJECT Q_PROPERTY(bool hasZ READ hasZ NOTIFY hasZChanged) @@ -42,7 +42,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlRotationSensorReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlRotationSensorReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal x READ x NOTIFY xChanged BINDABLE bindableX) diff --git a/src/sensorsquick/qmlsensor_p.h b/src/sensorsquick/qmlsensor_p.h index 0c0a9527..bbf3025d 100644 --- a/src/sensorsquick/qmlsensor_p.h +++ b/src/sensorsquick/qmlsensor_p.h @@ -34,7 +34,7 @@ class QSensorReading; class QmlSensorReading; class QmlSensorPrivate; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensor : public QObject, public QQmlParserStatus +class Q_SENSORSQUICK_EXPORT QmlSensor : public QObject, public QQmlParserStatus { Q_OBJECT Q_DECLARE_PRIVATE(QmlSensor) @@ -180,7 +180,7 @@ private: m_reading, nullptr) }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensorReading : public QObject +class Q_SENSORSQUICK_EXPORT QmlSensorReading : public QObject { Q_OBJECT Q_PROPERTY(quint64 timestamp READ timestamp NOTIFY timestampChanged BINDABLE bindableTimestamp) diff --git a/src/sensorsquick/qmlsensorglobal_p.h b/src/sensorsquick/qmlsensorglobal_p.h index 007a8f2a..8b5214a2 100644 --- a/src/sensorsquick/qmlsensorglobal_p.h +++ b/src/sensorsquick/qmlsensorglobal_p.h @@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE class QSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensorGlobal : public QObject +class Q_SENSORSQUICK_EXPORT QmlSensorGlobal : public QObject { Q_OBJECT public: diff --git a/src/sensorsquick/qmlsensorrange_p.h b/src/sensorsquick/qmlsensorrange_p.h index e03f9f67..324c24db 100644 --- a/src/sensorsquick/qmlsensorrange_p.h +++ b/src/sensorsquick/qmlsensorrange_p.h @@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensorRange : public QObject +class Q_SENSORSQUICK_EXPORT QmlSensorRange : public QObject { Q_OBJECT Q_PROPERTY(int minimum READ minimum) @@ -45,7 +45,7 @@ private: int max; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlSensorOutputRange : public QObject +class Q_SENSORSQUICK_EXPORT QmlSensorOutputRange : public QObject { Q_OBJECT Q_PROPERTY(qreal minimum READ minimum) diff --git a/src/sensorsquick/qmltapsensor_p.h b/src/sensorsquick/qmltapsensor_p.h index 3bb25812..7537c5db 100644 --- a/src/sensorsquick/qmltapsensor_p.h +++ b/src/sensorsquick/qmltapsensor_p.h @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE class QTapSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlTapSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlTapSensor : public QmlSensor { Q_OBJECT Q_PROPERTY(bool returnDoubleTapEvents READ returnDoubleTapEvents WRITE setReturnDoubleTapEvents NOTIFY returnDoubleTapEventsChanged) @@ -45,7 +45,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlTapSensorReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlTapSensorReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(QTapReading::TapDirection tapDirection READ tapDirection diff --git a/src/sensorsquick/qmltiltsensor_p.h b/src/sensorsquick/qmltiltsensor_p.h index c86866a3..d660229d 100644 --- a/src/sensorsquick/qmltiltsensor_p.h +++ b/src/sensorsquick/qmltiltsensor_p.h @@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE class QTiltSensor; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlTiltSensor : public QmlSensor +class Q_SENSORSQUICK_EXPORT QmlTiltSensor : public QmlSensor { Q_OBJECT QML_NAMED_ELEMENT(TiltSensor) @@ -40,7 +40,7 @@ private: QmlSensorReading *createReading() const override; }; -class Q_SENSORSQUICK_PRIVATE_EXPORT QmlTiltSensorReading : public QmlSensorReading +class Q_SENSORSQUICK_EXPORT QmlTiltSensorReading : public QmlSensorReading { Q_OBJECT Q_PROPERTY(qreal yRotation READ yRotation NOTIFY yRotationChanged BINDABLE bindableYRotation) diff --git a/src/sensorsquick/qsensorsquickglobal_p.h b/src/sensorsquick/qsensorsquickglobal_p.h index 91c41c54..4826ed82 100644 --- a/src/sensorsquick/qsensorsquickglobal_p.h +++ b/src/sensorsquick/qsensorsquickglobal_p.h @@ -16,8 +16,8 @@ // #include <QtCore/qglobal.h> -#include <QtSensorsQuick/private/qtsensorsquickexports_p.h> +#include <QtSensorsQuick/qtsensorsquickexports.h> -void Q_SENSORSQUICK_PRIVATE_EXPORT qml_register_types_QtSensors(); +void Q_SENSORSQUICK_EXPORT qml_register_types_QtSensors(); #endif // QSENSORSQUICKGLOBALS_P_H |