Commit 48a5abcd authored by Matti Lehtimäki's avatar Matti Lehtimäki

Merge branch 'remove_qt4' into 'master'

[sensorfw] Remove obsolete Qt4 support. Contributes to JB#38781

See merge request !50
parents da053281 e71c8096
......@@ -34,7 +34,3 @@ void AccelerometerAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<AccelerometerAdaptor>("accelerometeradaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(accelerometeradaptor, AccelerometerAdaptorPlugin)
#endif
......@@ -31,9 +31,7 @@
class AccelerometerAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
......
......@@ -39,7 +39,3 @@ void ALSAdaptorAsciiPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ALSAdaptorAscii>("alsadaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(alsadaptor, ALSAdaptorAsciiPlugin)
#endif
......@@ -37,9 +37,7 @@
class ALSAdaptorAsciiPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
......
......@@ -37,7 +37,3 @@ void ALSAdaptorEvdevPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ALSAdaptorEvdev>("alsadaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(alsadaptor-evdev, ALSAdaptorEvdevPlugin)
#endif
......@@ -34,9 +34,7 @@
class ALSAdaptorEvdevPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
......
......@@ -35,7 +35,3 @@ void ALSAdaptorSysfsPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ALSAdaptorSysfs>("alsadaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(alsadaptor-sysfs, ALSAdaptorSysfsPlugin)
#endif
......@@ -32,9 +32,7 @@
class ALSAdaptorSysfsPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
......
......@@ -34,7 +34,3 @@ void ALSAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ALSAdaptor>("alsadaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(alsadaptor, ALSAdaptorPlugin)
#endif
......@@ -31,9 +31,7 @@
class ALSAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
......
......@@ -37,7 +37,3 @@ void GyroAdaptorEvdevPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<GyroAdaptorEvdev>("gyroscopeadaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(gyroadaptor-evdev, GyroAdaptorEvdevPlugin)
#endif
......@@ -34,9 +34,7 @@
class GyroAdaptorEvdevPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
......
......@@ -34,7 +34,3 @@ void GyroscopeAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<GyroscopeAdaptor>("gyroscopeadaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(gyroscopeadaptor, GyroscopeAdaptorPlugin)
#endif
......@@ -32,9 +32,7 @@
class GyroscopeAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
......
......@@ -34,7 +34,3 @@ void HumidityAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HumidityAdaptor>("humidityadaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(humidityadaptor, HumidityAdaptorPlugin)
#endif
......@@ -31,9 +31,7 @@
class HumidityAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
......
......@@ -29,7 +29,3 @@ void HybrisAccelerometerAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisAccelerometerAdaptor>("accelerometeradaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(hybrisaccelerometeradaptor, HybrisAccelerometerAdaptorPlugin)
#endif
......@@ -26,9 +26,7 @@
class HybrisAccelerometerAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
......
......@@ -29,7 +29,3 @@ void HybrisAlsAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisAlsAdaptor>("alsadaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(hybrisalsadaptor, HybrisAlsAdaptorPlugin)
#endif
......@@ -26,9 +26,7 @@
class HybrisAlsAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
......
......@@ -29,7 +29,3 @@ void HybrisGyroscopeAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisGyroscopeAdaptor>("gyroscopeadaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(hybrisgyroscopeadaptor, HybrisGyroscopeAdaptorPlugin)
#endif
......@@ -26,9 +26,7 @@
class HybrisGyroscopeAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
......
......@@ -29,7 +29,3 @@ void HybrisMagnetometerAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisMagnetometerAdaptor>("magnetometeradaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(hybrismagnetometeradaptor, HybrisMagnetometerAdaptorPlugin)
#endif
......@@ -26,9 +26,7 @@
class HybrisMagnetometerAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
......
......@@ -29,7 +29,3 @@ void HybrisOrientationAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisOrientationAdaptor>("orientationadaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(hybrisorientationadaptor, HybrisOrientationAdaptorPlugin)
#endif
......@@ -26,9 +26,7 @@
class HybrisOrientationAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
......
......@@ -31,7 +31,3 @@ void HybrisPressureAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisPressureAdaptor>("pressureadaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(hybrispressureadaptor, HybrisPressureAdaptorPlugin)
#endif
......@@ -28,9 +28,7 @@
class HybrisPressureAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
......
......@@ -29,7 +29,3 @@ void HybrisProximityAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisProximityAdaptor>("proximityadaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(hybrisproximityadaptor, HybrisProximityAdaptorPlugin)
#endif
......@@ -26,9 +26,7 @@
class HybrisProximityAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
......
......@@ -32,7 +32,3 @@ void HybrisStepCounterAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisStepCounterAdaptor>("stepcounteradaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(hybrisstepcounteradaptor, HybrisStepCounterAdaptorPlugin)
#endif
......@@ -29,9 +29,7 @@
class HybrisStepCounterAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
......
......@@ -38,7 +38,3 @@ void IioAdaptorPlugin::Register(class Loader&)
sm.registerDeviceAdaptor<IioAdaptor>("alsadaptor");
sm.registerDeviceAdaptor<IioAdaptor>("proximityadaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(iioadaptor, IioAdaptorPlugin)
#endif
......@@ -32,9 +32,7 @@ r <lorn.potter@canonical.com>
class IioAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
......
......@@ -34,7 +34,3 @@ void KeyboardSliderAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<KeyboardSliderAdaptor>("kbslideradaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(kbslideradaptor, KeyboardSliderAdaptorPlugin)
#endif
......@@ -31,9 +31,7 @@
class KeyboardSliderAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
......
......@@ -34,7 +34,3 @@ void LidsensorAdaptorEvdevPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<LidSensorAdaptorEvdev>("lidsensoradaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(lidsensoradaptor-evdev, LidsensorAdaptorEvdevPlugin)
#endif
......@@ -31,9 +31,7 @@
class LidsensorAdaptorEvdevPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
......
......@@ -38,7 +38,3 @@ void MagnetometerAdaptorAsciiPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MagnetometerAdaptorAscii>("magnetometeradaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(magnetometeradaptor, MagnetometerAdaptorAsciiPlugin)
#endif
......@@ -37,7 +37,3 @@ void MagnetometerAdaptorEvdevPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MagAdaptorEvdev>("magnetometeradaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(magnetometeradaptor-evdev, MagnetometerAdaptorEvdevPlugin)
#endif
......@@ -33,9 +33,7 @@
class MagnetometerAdaptorEvdevPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
......
......@@ -33,7 +33,3 @@ void MagnetometerAdaptorPluginNCDK::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MagnetometerAdaptorNCDK>("magnetometeradaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(magnetometeradaptor, MagnetometerAdaptorPluginNCDK)
#endif
......@@ -34,7 +34,3 @@ void MagnetometerAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MagnetometerAdaptor>("magnetometeradaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(magnetometeradaptor, MagnetometerAdaptorPlugin)
#endif
......@@ -31,9 +31,7 @@
class MagnetometerAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
......
......@@ -29,7 +29,3 @@ void Mpu6050AccelerometerAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<Mpu6050AccelAdaptor>("accelerometeradaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(mpu6050accelerometeradaptor, Mpu6050AccelerometerAdaptorPlugin)
#endif
......@@ -26,9 +26,7 @@
class Mpu6050AccelerometerAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
......
......@@ -33,7 +33,3 @@ void MRSTAccelerometerAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MRSTAccelAdaptor>("accelerometeradaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(accelerometeradaptor-mrst, MRSTAccelerometerAdaptorPlugin)
#endif
......@@ -30,9 +30,7 @@
class MRSTAccelerometerAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
......
......@@ -9,7 +9,3 @@ void OaktrailAccelerometerAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OaktrailAccelAdaptor>("accelerometeradaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(oaktrailaccelerometeradaptor, OaktrailAccelerometerAdaptorPlugin)
#endif
......@@ -6,9 +6,7 @@
class OaktrailAccelerometerAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
......
......@@ -9,7 +9,3 @@ void OemtabletAccelerometerAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OemtabletAccelAdaptor>("accelerometeradaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(oemtabletaccelerometeradaptor, OemtabletAccelerometerAdaptorPlugin)
#endif
......@@ -6,9 +6,7 @@
class OemtabletAccelerometerAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
......
......@@ -8,7 +8,3 @@ void OEMTabletALSAdaptorAsciiPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OEMTabletALSAdaptorAscii>("alsadaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(alsadaptor, OEMTabletALSAdaptorAsciiPlugin)
#endif
......@@ -6,9 +6,7 @@
class OEMTabletALSAdaptorAsciiPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
......
......@@ -8,5 +8,3 @@ void OEMTabletGyroscopeAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OEMTabletGyroscopeAdaptor>("gyroscopeadaptor");
}
Q_EXPORT_PLUGIN2(gyroscopeadaptor, OEMTabletGyroscopeAdaptorPlugin)
......@@ -6,9 +6,7 @@
class OEMTabletGyroscopeAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
......
......@@ -8,5 +8,3 @@ void OemtabletMagnetometerAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OemtabletMagnetometerAdaptor>("magnetometeradaptor");
}
Q_EXPORT_PLUGIN2(magnetometeradaptor, OemtabletMagnetometerAdaptorPlugin)
......@@ -6,9 +6,7 @@
class OemtabletMagnetometerAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
......
......@@ -9,7 +9,3 @@ void PegatronAccelerometerAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<PegatronAccelerometerAdaptor>("accelerometeradaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(pegatronaccelerometeradaptor, PegatronAccelerometerAdaptorPlugin)
#endif
......@@ -6,9 +6,7 @@
class PegatronAccelerometerAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
......
......@@ -37,7 +37,3 @@ void PressureAdaptorPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<PressureAdaptor>("pressureadaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(pressureadaptor, PressureAdaptorPlugin)
#endif
......@@ -31,9 +31,7 @@
class PressureAdaptorPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
......
......@@ -38,7 +38,3 @@ void ProximityAdaptorAsciiPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ProximityAdaptorAscii>("proximityadaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(proximityadaptor, ProximityAdaptorAsciiPlugin)
#endif
......@@ -36,9 +36,7 @@
class ProximityAdaptorAsciiPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);
};
......
......@@ -35,7 +35,3 @@ void ProximityAdaptorEvdevPlugin::Register(class Loader&)
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ProximityAdaptorEvdev>("proximityadaptor");
}
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
Q_EXPORT_PLUGIN2(proximityadaptor-evdev, ProximityAdaptorEvdevPlugin)
#endif
......@@ -32,9 +32,7 @@
class ProximityAdaptorEvdevPlugin : public Plugin
{
Q_OBJECT
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
#endif
private:
void Register(class Loader& l);