[-]
[+]
|
Changed |
_service:tar_git:sensorfw.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfw-qt5-hybris.spec
^
|
|
[-]
[+]
|
Deleted |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.0.tar.bz2/LuneOS/sysbus/com.nokia.SensorService.json.prv
^
|
@@ -1,14 +0,0 @@
-{
- "role": {
- "exeName":"/usr/sbin/sensorfwd",
- "type": "privileged",
- "allowedNames": ["com.nokia.SensorService"]
- },
- "permissions": [
- {
- "service":"com.nokia.SensorService",
- "inbound":["*"],
- "outbound":["*"]
- }
- ]
-}
|
[-]
[+]
|
Deleted |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.0.tar.bz2/LuneOS/sysbus/com.nokia.SensorService.service.prv
^
|
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=com.nokia.SensorService
-Exec=/usr/sbin/sensrofwd
-Type=static
|
[-]
[+]
|
Deleted |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.0.tar.bz2/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdev.pro.user
^
|
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.4.1, 2016-10-26T11:47:56. -->
-<qtcreator>
- <data>
- <variable>EnvironmentId</variable>
- <value type="QByteArray">{272d5cea-eec6-4d5f-9f49-7f2059a976c7}</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.ActiveTarget</variable>
- <value type="int">0</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.EditorSettings</variable>
- <valuemap type="QVariantMap">
- <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
- <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
- <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
- <value type="QString" key="language">Cpp</value>
- <valuemap type="QVariantMap" key="value">
- <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
- </valuemap>
- </valuemap>
- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
- <value type="QString" key="language">QmlJS</value>
- <valuemap type="QVariantMap" key="value">
- <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
- </valuemap>
- </valuemap>
- <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
- <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
- <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
- <value type="int" key="EditorConfiguration.IndentSize">4</value>
- <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
- <value type="int" key="EditorConfiguration.MarginColumn">80</value>
- <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
- <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
- <value type="int" key="EditorConfiguration.PaddingMode">1</value>
- <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
- <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
- <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
- <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
- <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
- <value type="int" key="EditorConfiguration.TabSize">8</value>
- <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
- <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
- <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
- <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
- <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
- <value type="bool" key="EditorConfiguration.inEntireDocument">true</value>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.PluginSettings</variable>
- <valuemap type="QVariantMap"/>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Target.0</variable>
- <valuemap type="QVariantMap">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.4.2 GCC 64bit</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.4.2 GCC 64bit</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.54.gcc_64_kit</value>
- <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
- <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
- <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/lpotter/builds/build-lidsensoradaptor-evdev-Desktop_Qt_5_4_2_GCC_64bit-Debug</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
- <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
- <value type="QString">-w</value>
- <value type="QString">-r</value>
- </valuelist>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
- <value type="QString">-w</value>
- <value type="QString">-r</value>
- </valuelist>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
- <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/lpotter/builds/build-lidsensoradaptor-evdev-Desktop_Qt_5_4_2_GCC_64bit-Release</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
- <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
- <value type="QString">-w</value>
- <value type="QString">-r</value>
- </valuelist>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
- <value type="QString">-w</value>
- <value type="QString">-r</value>
- </valuelist>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
- <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
- <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
[-]
[+]
|
Deleted |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.0.tar.bz2/sensord.pc
^
|
@@ -1,10 +0,0 @@
-prefix=/usr
-includedir=${prefix}/include/sensord
-libdir=${prefix}/lib/
-
-Name: Sensorfw
-Description: Sensorfw
-Version: 0.7.2.1
-Requires:
-Libs: -L${libdir} -lsensorclient -lsensordatatypes
-Cflags: -I${includedir} -I${includedir}/datatypes -I${includedir}/filters
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/LuneOS/sysbus/com.nokia.SensorService.role.json
^
|
@@ -0,0 +1,12 @@
+{
+ "exeName":"/usr/sbin/sensorfwd",
+ "type": "privileged",
+ "allowedNames": ["com.nokia.SensorService"],
+ "permissions": [
+ {
+ "service":"com.nokia.SensorService",
+ "inbound":["*"],
+ "outbound":["*"]
+ }
+ ]
+}
|
[-]
[+]
|
Added |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/LuneOS/sysbus/com.nokia.SensorService.service
^
|
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=com.nokia.SensorService
+Exec=/usr/sbin/sensorfwd -c=/etc/sensorfw/primaryuse.conf
+Type=static
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/LuneOS/systemd/sensorfwd.service
^
|
@@ -1,7 +1,7 @@
[Unit]
Description=Sensor daemon for sensor framework
-After=dbus.socket ls-hubd_private.service
-Requires=dbus.service ls-hubd_private.service
+After=dbus.socket ls-hubd.service
+Requires=dbus.service ls-hubd.service
Conflicts=actdead.target
[Service]
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/accelerometeradaptor/accelerometeradaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<AccelerometerAdaptor>("accelerometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(accelerometeradaptor, AccelerometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/accelerometeradaptor/accelerometeradaptorplugin.h
^
|
@@ -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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/alsadaptor-ascii/alsadaptor-asciiplugin.cpp
^
|
@@ -39,7 +39,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ALSAdaptorAscii>("alsadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alsadaptor, ALSAdaptorAsciiPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/alsadaptor-ascii/alsadaptor-asciiplugin.h
^
|
@@ -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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/alsadaptor-evdev/alsadaptor-evdevplugin.cpp
^
|
@@ -37,7 +37,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ALSAdaptorEvdev>("alsadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alsadaptor-evdev, ALSAdaptorEvdevPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/alsadaptor-evdev/alsadaptor-evdevplugin.h
^
|
@@ -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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/alsadaptor-sysfs/alsadaptor-sysfsplugin.cpp
^
|
@@ -35,7 +35,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ALSAdaptorSysfs>("alsadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alsadaptor-sysfs, ALSAdaptorSysfsPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/alsadaptor-sysfs/alsadaptor-sysfsplugin.h
^
|
@@ -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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/alsadaptor/alsadaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ALSAdaptor>("alsadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alsadaptor, ALSAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/alsadaptor/alsadaptorplugin.h
^
|
@@ -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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/gyroscopeadaptor-evdev/gyroadaptor-evdevplugin.cpp
^
|
@@ -37,7 +37,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<GyroAdaptorEvdev>("gyroscopeadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(gyroadaptor-evdev, GyroAdaptorEvdevPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/gyroscopeadaptor-evdev/gyroadaptor-evdevplugin.h
^
|
@@ -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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/gyroscopeadaptor/gyroscopeadaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<GyroscopeAdaptor>("gyroscopeadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(gyroscopeadaptor, GyroscopeAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/gyroscopeadaptor/gyroscopeadaptorplugin.h
^
|
@@ -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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/humidityadaptor/humidityadaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HumidityAdaptor>("humidityadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(humidityadaptor, HumidityAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/humidityadaptor/humidityadaptorplugin.h
^
|
@@ -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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptorplugin.cpp
^
|
@@ -29,7 +29,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisAccelerometerAdaptor>("accelerometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrisaccelerometeradaptor, HybrisAccelerometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptorplugin.h
^
|
@@ -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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/hybrisalsadaptor/hybrisalsadaptorplugin.cpp
^
|
@@ -29,7 +29,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisAlsAdaptor>("alsadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrisalsadaptor, HybrisAlsAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/hybrisalsadaptor/hybrisalsadaptorplugin.h
^
|
@@ -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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptorplugin.cpp
^
|
@@ -29,7 +29,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisGyroscopeAdaptor>("gyroscopeadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrisgyroscopeadaptor, HybrisGyroscopeAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptorplugin.h
^
|
@@ -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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptorplugin.cpp
^
|
@@ -29,7 +29,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisMagnetometerAdaptor>("magnetometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrismagnetometeradaptor, HybrisMagnetometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptorplugin.h
^
|
@@ -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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/hybrisorientationadaptor/hybrisorientationadaptorplugin.cpp
^
|
@@ -29,7 +29,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisOrientationAdaptor>("orientationadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrisorientationadaptor, HybrisOrientationAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/hybrisorientationadaptor/hybrisorientationadaptorplugin.h
^
|
@@ -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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/hybrispressureadaptor/hybrispressureadaptorplugin.cpp
^
|
@@ -31,7 +31,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisPressureAdaptor>("pressureadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrispressureadaptor, HybrisPressureAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/hybrispressureadaptor/hybrispressureadaptorplugin.h
^
|
@@ -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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/hybrisproximityadaptor/hybrisproximityadaptorplugin.cpp
^
|
@@ -29,7 +29,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisProximityAdaptor>("proximityadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrisproximityadaptor, HybrisProximityAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/hybrisproximityadaptor/hybrisproximityadaptorplugin.h
^
|
@@ -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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptorplugin.cpp
^
|
@@ -32,7 +32,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<HybrisStepCounterAdaptor>("stepcounteradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrisstepcounteradaptor, HybrisStepCounterAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptorplugin.h
^
|
@@ -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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/iioadaptor/iioadaptor.cpp
^
|
@@ -45,6 +45,7 @@
#include <QTimer>
#include <QDirIterator>
#include <qmath.h>
+#include <QRegularExpression>
#include <deviceadaptor.h>
#include "datatypes/orientationdata.h"
@@ -52,6 +53,11 @@
#define GRAVITY 9.80665
#define REV_GRAVITY 0.101936799
+// Proximity sensor
+#define PROXIMITY_DEFAULT_THRESHOLD 250
+#define PROXIMITY_NEAR_VALUE 0
+#define PROXIMITY_FAR_VALUE 100
+
/* Conversion of acceleration data to SI units (m/s^2) */
#define CONVERT_A_X(x) ((float(x) / 1000) * (GRAVITY * -1.0))
#define CONVERT_A_Y(x) ((float(x) / 1000) * (GRAVITY * 1.0))
@@ -73,6 +79,8 @@
delete alsBuffer_;
if (magnetometerBuffer_)
delete magnetometerBuffer_;
+ if (proximityBuffer_)
+ delete proximityBuffer_;
}
void IioAdaptor::setup()
@@ -84,6 +92,7 @@
const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
qDebug() << "input_match" << inputMatch;
+ iioDevice.channelTypeName = "accel";
devNodeNumber = findSensor(inputMatch);
if (devNodeNumber!= -1) {
const QString desc = "Industrial I/O accelerometer (" + iioDevice.name +")";
@@ -93,12 +102,12 @@
iioDevice.sensorType = IioAdaptor::IIO_ACCELEROMETER;
}
- }
- else if (deviceId.startsWith("gyro")) {
+ } else if (deviceId.startsWith("gyro")) {
const QString name = "gyroscope";
const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
qDebug() << "input_match" << inputMatch;
+ iioDevice.channelTypeName = "anglvel";
devNodeNumber = findSensor(inputMatch);
if (devNodeNumber!= -1) {
const QString desc = "Industrial I/O gyroscope (" + iioDevice.name +")";
@@ -107,14 +116,13 @@
iioDevice.sensorType = IioAdaptor::IIO_GYROSCOPE;
}
- }
- else if (deviceId.startsWith("mag")) {
+ } else if (deviceId.startsWith("mag")) {
const QString name = "magnetometer";
const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
qDebug() << "input_match" << inputMatch;
+ iioDevice.channelTypeName = "magn";
devNodeNumber = findSensor(inputMatch);
-
if (devNodeNumber!= -1) {
const QString desc = "Industrial I/O magnetometer (" + iioDevice.name +")";
magnetometerBuffer_ = new DeviceAdaptorRingBuffer<CalibratedMagneticFieldData>(1);
@@ -122,11 +130,11 @@
iioDevice.sensorType = IioAdaptor::IIO_MAGNETOMETER;
}
- }
- else if (deviceId.startsWith("als")) {
+ } else if (deviceId.startsWith("als")) {
const QString name = "als";
const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
+ iioDevice.channelTypeName = "illuminance";
devNodeNumber = findSensor(inputMatch);
if (devNodeNumber!= -1) {
QString desc = "Industrial I/O light sensor (" + iioDevice.name +")";
@@ -135,6 +143,21 @@
setAdaptedSensor(name, desc, alsBuffer_);
iioDevice.sensorType = IioAdaptor::IIO_ALS;
}
+ } else if (deviceId.startsWith("prox")) {
+ const QString name = "proximity";
+ const QString inputMatch = SensorFrameworkConfig::configuration()->value<QString>(name + "/input_match");
+ qDebug() << name + ":" << "input_match" << inputMatch;
+
+ iioDevice.channelTypeName = "proximity";
+ devNodeNumber = findSensor(inputMatch);
+ proximityThreshold = SensorFrameworkConfig::configuration()->value<QString>(name + "/threshold", QString(PROXIMITY_DEFAULT_THRESHOLD)).toInt();
+ if (devNodeNumber!= -1) {
+ QString desc = "Industrial I/O proximity sensor (" + iioDevice.name +")";
+ qDebug() << desc;
+ proximityBuffer_ = new DeviceAdaptorRingBuffer<ProximityData>(1);
+ setAdaptedSensor(name, desc, proximityBuffer_);
+ iioDevice.sensorType = IioAdaptor::IIO_PROXIMITY;
+ }
}
if (devNodeNumber == -1) {
@@ -142,8 +165,11 @@
// setValid(false);
return;
}
- iioDevice.channels = scanElementsEnable(devNodeNumber,1);
- scanElementsEnable(devNodeNumber,0);
+
+ if (mode() != SysfsAdaptor::IntervalMode) {
+ scanElementsEnable(devNodeNumber,1);
+ scanElementsEnable(devNodeNumber,0);
+ }
/* Override the scaling factor if asked */
bool ok;
@@ -190,7 +216,11 @@
QString eventName = QString::fromLatin1(udev_device_get_sysname(dev));
iioDevice.devicePath = QString::fromLatin1(udev_device_get_syspath(dev)) +"/";
iioDevice.index = eventName.right(1).toInt(&ok2);
- qDebug() << Q_FUNC_INFO << "syspath" << iioDevice.devicePath;
+ // Default values
+ iioDevice.offset = 0.0;
+ iioDevice.scale = 1.0;
+ iioDevice.frequency = 1.0;
+ qDebug() << Q_FUNC_INFO << "Syspath for sensor (" + sensorName + "):" << iioDevice.devicePath;
udev_list_entry_foreach(sysattr, udev_device_get_sysattr_list_entry(dev)) {
const char *name;
@@ -203,28 +233,29 @@
qDebug() << "attr" << name << value;
QString attributeName(name);
- if (attributeName.endsWith("scale")) {
+ if (attributeName.contains(QRegularExpression(iioDevice.channelTypeName + ".*scale$"))) {
iioDevice.scale = QString(value).toDouble(&ok);
if (ok) {
- // scale = num;
- qDebug() << "scale is" << iioDevice.scale;
+ qDebug() << sensorName + ":" << "Scale is" << iioDevice.scale;
}
- } else if (attributeName.endsWith("offset")) {
+ } else if (attributeName.contains(QRegularExpression(iioDevice.channelTypeName + ".*offset$"))) {
iioDevice.offset = QString(value).toDouble(&ok);
- if (ok)
- qDebug() << "offset is" << value;
+ if (ok) {
+ qDebug() << sensorName + ":" << "Offset is" << value;
+ }
} else if (attributeName.endsWith("frequency")) {
iioDevice.frequency = QString(value).toDouble(&ok);
- if (ok)
- // frequency = num;
- qDebug() << "frequency is" << iioDevice.frequency;
- } else if (attributeName.endsWith("raw")) {
+ if (ok) {
+ qDebug() << sensorName + ":" << "Frequency is" << iioDevice.frequency;
+ }
+ } else if (attributeName.contains(QRegularExpression(iioDevice.channelTypeName + ".*raw$"))) {
qDebug() << "adding to paths:" << iioDevice.devicePath
<< attributeName << iioDevice.index;
addPath(iioDevice.devicePath + attributeName, j);
j++;
}
}
+ iioDevice.channels = j;
// in_rot_from_north_magnetic_tilt_comp_raw ?
@@ -271,7 +302,7 @@
if (enable == 1) {
// FIXME: should enable sensors for this device? Assuming enabled already
- iioDevice.channels = scanElementsEnable(device, enable);
+ scanElementsEnable(device, enable);
sysfsWriteInt(pathLength, IIO_BUFFER_LEN);
sysfsWriteInt(pathEnable, enable);
} else {
@@ -347,7 +378,7 @@
// Find all the *_en file and write 0/1 to it
QStringList filters;
- filters << "*_en";
+ filters << ("*" + iioDevice.channelTypeName + "*_en");
dir.setNameFilters(filters);
QFileInfoList list = dir.entryInfoList();
@@ -403,10 +434,15 @@
sensordLogW() << "read():" << strerror(errno);
return;
}
- result = strtol(buf, NULL, 10);
- if (result == 0)
+ errno = 0; // reset errno before call
+ result = strtol(buf, NULL, 10);
+
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/iioadaptor/iioadaptor.h
^
|
@@ -55,7 +55,8 @@
IIO_MAGNETOMETER, // magn_3d
IIO_ROTATION, // dev_rotation, quaternion
IIO_ALS, // als
- IIO_TILT // incli_3d
+ IIO_TILT, // incli_3d
+ IIO_PROXIMITY // proximity als
};
struct iio_device {
@@ -68,6 +69,7 @@
QString devicePath;
int index;
IioSensorType sensorType;
+ QString channelTypeName;
};
public:
@@ -129,9 +131,12 @@
// Device number for the sensor (-1 if not found)
int devNodeNumber;
+ int proximityThreshold;
+
DeviceAdaptorRingBuffer<TimedXyzData>* iioXyzBuffer_;
DeviceAdaptorRingBuffer<TimedUnsigned>* alsBuffer_;
DeviceAdaptorRingBuffer<CalibratedMagneticFieldData>* magnetometerBuffer_;
+ DeviceAdaptorRingBuffer<ProximityData>* proximityBuffer_;
iio_device iioDevice;
@@ -140,6 +145,7 @@
TimedXyzData* timedData;
CalibratedMagneticFieldData *calData;
TimedUnsigned *uData;
+ ProximityData *proximityData;
private slots:
void setup();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/iioadaptor/iioadaptor.pro
^
|
@@ -1,5 +1,4 @@
-TARGET = iioaccelerometeradaptor
-#TARGET = iiosensorsadaptor
+TARGET = iiosensorsadaptor
HEADERS += iioadaptor.h \
iioadaptorplugin.h
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/iioadaptor/iioadaptorplugin.cpp
^
|
@@ -36,8 +36,5 @@
sm.registerDeviceAdaptor<IioAdaptor>("gyroscopeadaptor");
sm.registerDeviceAdaptor<IioAdaptor>("magnetometeradaptor");
sm.registerDeviceAdaptor<IioAdaptor>("alsadaptor");
+ sm.registerDeviceAdaptor<IioAdaptor>("proximityadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(iioadaptor, IioAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/iioadaptor/iioadaptorplugin.h
^
|
@@ -32,9 +32,7 @@
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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/kbslideradaptor/kbslideradaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<KeyboardSliderAdaptor>("kbslideradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(kbslideradaptor, KeyboardSliderAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/kbslideradaptor/kbslideradaptorplugin.h
^
|
@@ -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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdevplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<LidSensorAdaptorEvdev>("lidsensoradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(lidsensoradaptor-evdev, LidsensorAdaptorEvdevPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdevplugin.h
^
|
@@ -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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/magnetometeradaptor-ascii/magnetometeradaptor-asciiplugin.cpp
^
|
@@ -38,7 +38,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MagnetometerAdaptorAscii>("magnetometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magnetometeradaptor, MagnetometerAdaptorAsciiPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/magnetometeradaptor-evdev/magnetometeradaptor-evdevplugin.cpp
^
|
@@ -37,7 +37,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MagAdaptorEvdev>("magnetometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magnetometeradaptor-evdev, MagnetometerAdaptorEvdevPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/magnetometeradaptor-evdev/magnetometeradaptor-evdevplugin.h
^
|
@@ -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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/magnetometeradaptor-ncdk/magnetometeradaptorplugin-ncdk.cpp
^
|
@@ -33,7 +33,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MagnetometerAdaptorNCDK>("magnetometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magnetometeradaptor, MagnetometerAdaptorPluginNCDK)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/magnetometeradaptor/magnetometeradaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MagnetometerAdaptor>("magnetometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magnetometeradaptor, MagnetometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/magnetometeradaptor/magnetometeradaptorplugin.h
^
|
@@ -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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptorplugin.cpp
^
|
@@ -29,7 +29,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<Mpu6050AccelAdaptor>("accelerometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(mpu6050accelerometeradaptor, Mpu6050AccelerometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptorplugin.h
^
|
@@ -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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/mrstaccelerometer/mrstaccelerometeradaptorplugin.cpp
^
|
@@ -33,7 +33,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<MRSTAccelAdaptor>("accelerometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(accelerometeradaptor-mrst, MRSTAccelerometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/mrstaccelerometer/mrstaccelerometeradaptorplugin.h
^
|
@@ -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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptorplugin.cpp
^
|
@@ -9,7 +9,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OaktrailAccelAdaptor>("accelerometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(oaktrailaccelerometeradaptor, OaktrailAccelerometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptorplugin.h
^
|
@@ -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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptorplugin.cpp
^
|
@@ -9,7 +9,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OemtabletAccelAdaptor>("accelerometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(oemtabletaccelerometeradaptor, OemtabletAccelerometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptorplugin.h
^
|
@@ -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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-asciiplugin.cpp
^
|
@@ -8,7 +8,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OEMTabletALSAdaptorAscii>("alsadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alsadaptor, OEMTabletALSAdaptorAsciiPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-asciiplugin.h
^
|
@@ -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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/oemtabletgyroscopeadaptor/oemtabletgyroscopeadaptorplugin.cpp
^
|
@@ -8,5 +8,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OEMTabletGyroscopeAdaptor>("gyroscopeadaptor");
}
-
-Q_EXPORT_PLUGIN2(gyroscopeadaptor, OEMTabletGyroscopeAdaptorPlugin)
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/oemtabletgyroscopeadaptor/oemtabletgyroscopeadaptorplugin.h
^
|
@@ -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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/oemtabletmagnetometeradaptor/oemtabletmagnetometeradaptorplugin.cpp
^
|
@@ -8,5 +8,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<OemtabletMagnetometerAdaptor>("magnetometeradaptor");
}
-
-Q_EXPORT_PLUGIN2(magnetometeradaptor, OemtabletMagnetometerAdaptorPlugin)
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/oemtabletmagnetometeradaptor/oemtabletmagnetometeradaptorplugin.h
^
|
@@ -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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptorplugin.cpp
^
|
@@ -9,7 +9,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<PegatronAccelerometerAdaptor>("accelerometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(pegatronaccelerometeradaptor, PegatronAccelerometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptorplugin.h
^
|
@@ -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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/pressureadaptor/pressureadaptorplugin.cpp
^
|
@@ -37,7 +37,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<PressureAdaptor>("pressureadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(pressureadaptor, PressureAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/pressureadaptor/pressureadaptorplugin.h
^
|
@@ -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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/proximityadaptor-ascii/proximityadaptor-asciiplugin.cpp
^
|
@@ -38,7 +38,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ProximityAdaptorAscii>("proximityadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(proximityadaptor, ProximityAdaptorAsciiPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/proximityadaptor-ascii/proximityadaptor-asciiplugin.h
^
|
@@ -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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/proximityadaptor-evdev/proximityadaptor-evdevplugin.cpp
^
|
@@ -35,7 +35,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ProximityAdaptorEvdev>("proximityadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(proximityadaptor-evdev, ProximityAdaptorEvdevPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/proximityadaptor-evdev/proximityadaptor-evdevplugin.h
^
|
@@ -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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/proximityadaptor/proximityadaptorplugin.cpp
^
|
@@ -35,7 +35,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<ProximityAdaptor>("proximityadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(proximityadaptor, ProximityAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/proximityadaptor/proximityadaptorplugin.h
^
|
@@ -32,9 +32,7 @@
class ProximityAdaptorPlugin : 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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/steaccelerometeradaptor/steaccelerometeradaptorplugin.cpp
^
|
@@ -9,7 +9,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<SteAccelAdaptor>("accelerometeradaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(steaccelerometeradaptor,SteAccelerometerAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/steaccelerometeradaptor/steaccelerometeradaptorplugin.h
^
|
@@ -6,9 +6,7 @@
class SteAccelerometerAdaptorPlugin : 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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/tapadaptor/tapadaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<TapAdaptor>("tapadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(tapadaptor, TapAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/tapadaptor/tapadaptorplugin.h
^
|
@@ -31,9 +31,7 @@
class TapAdaptorPlugin : 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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/temperatureadaptor/temperatureadaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<TemperatureAdaptor>("temperatureadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(temperatureadaptor, TemperatureAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/temperatureadaptor/temperatureadaptorplugin.h
^
|
@@ -34,9 +34,7 @@
class TemperatureAdaptorPlugin : 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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/touchadaptor/touchadaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<TouchAdaptor>("touchadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(touchadaptor, TouchAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/adaptors/touchadaptor/touchadaptorplugin.h
^
|
@@ -31,9 +31,7 @@
class TouchAdaptorPlugin : 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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/chains/accelerometerchain/accelerometerchainplugin.cpp
^
|
@@ -39,7 +39,3 @@
QStringList AccelerometerChainPlugin::Dependencies() {
return QString("coordinatealignfilter:accelerometeradaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(accelerometerchain, AccelerometerChainPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/chains/accelerometerchain/accelerometerchainplugin.h
^
|
@@ -31,9 +31,7 @@
class AccelerometerChainPlugin : 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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/chains/compasschain/compasschainplugin.cpp
^
|
@@ -44,7 +44,3 @@
return QString("accelerometerchain:magcalibrationchain:declinationfilter:downsamplefilter:avgaccfilter:orientationadaptor").split(":", QString::SkipEmptyParts);
}
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(compasschain, CompassChainPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/chains/compasschain/compasschainplugin.h
^
|
@@ -25,10 +25,7 @@
class CompassChainPlugin : public Plugin
{
Q_OBJECT
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/chains/magcalibrationchain/magcalibrationchainplugin.cpp
^
|
@@ -35,7 +35,3 @@
QStringList MagCalibrationChainPlugin::Dependencies() {
return QString("magcoordinatealignfilter:magnetometeradaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magcalibrationchain, MagCalibrationChainPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/chains/magcalibrationchain/magcalibrationchainplugin.h
^
|
@@ -27,10 +27,7 @@
class MagCalibrationChainPlugin : public Plugin
{
Q_OBJECT
-
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
-#endif
private:
void Register(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/chains/orientationchain/orientationchainplugin.cpp
^
|
@@ -39,7 +39,3 @@
QStringList OrientationChainPlugin::Dependencies() {
return QString("orientationinterpreter:accelerometerchain").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(orientationchain, OrientationChainPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/chains/orientationchain/orientationchainplugin.h
^
|
@@ -31,9 +31,7 @@
class OrientationChainPlugin : 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);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/common-config.pri
^
|
@@ -29,9 +29,7 @@
QMAKE_LFLAGS += -lc_p
}
-equals(QT_MAJOR_VERSION, 5):{
- TARGET = $$TARGET-qt5
-}
+TARGET = $$TARGET-qt5
OTHER_FILES += \
../../common.pri
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/common-install.pri
^
|
@@ -8,15 +8,8 @@
QT -= gui
# Path for headers - remember to add files if they should be installed
-equals(QT_MAJOR_VERSION, 4): {
- publicheaders.path = /usr/include/sensord
- PLUGINPATH = /usr/lib/sensord
-}
-
-equals(QT_MAJOR_VERSION, 5): {
- publicheaders.path = /usr/include/sensord-qt5
- PLUGINPATH = /usr/lib/sensord-qt5
-}
+publicheaders.path = /usr/include/sensord-qt5
+PLUGINPATH = /usr/lib/sensord-qt5
# Path for shared libraries
SHAREDLIBPATH = /usr/lib
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/common.pri
^
|
@@ -1,6 +1 @@
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorfw
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorfw-qt5
-}
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorfw-qt5
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/core/core.pro
^
|
@@ -15,14 +15,8 @@
DEPENDPATH += $$SENSORFW_INCLUDEPATHS
INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
-QMAKE_LIBDIR_FLAGS += -L../datatypes
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes
-}
-
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5
-}
+QMAKE_LIBDIR_FLAGS += -L../datatypes\
+ -lsensordatatypes-qt5
SOURCES += sensormanager.cpp \
sensormanager_a.cpp \
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/core/hybrisadaptor.cpp
^
|
@@ -354,8 +354,6 @@
m_sensorState[i].m_maxDelay = maxDelay;
setDelay(m_sensorArray[i].handle, delay, true);
- setActive(m_sensorArray[i].handle, true);
- setDelay(m_sensorArray[i].handle, delay, false);
sensordLogD("delay = %d [%d, %d]",
m_sensorState[i].m_delay,
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/debian/changelog
^
|
@@ -1,3 +1,9 @@
+sensorfw-qt5 (0.11.1) unstable; urgency=medium
+
+ * [packaging] Add missing debian build dependencies. Fixes MER#2060
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com> Mon, 07 Oct 2019 15:28:35 +0300
+
sensorfw-qt5 (0.7.4) unstable; urgency=medium
* add lid sensor
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/debian/control
^
|
@@ -3,7 +3,16 @@
Priority: optional
Maintainer: Lorn Potter <lorn.potter@gmail.com>
Uploaders:
-Build-Depends: debhelper (>=5), qt5-default, libudev-dev
+Build-Depends: debhelper (>=5),
+ qt5-default,
+ libudev-dev,
+ libsystemd-dev,
+ doxygen,
+ graphviz,
+ pkg-config,
+ libhardware-dev,
+ android-headers,
+ libhybris-dev
Standards-Version: 3.7.3
Package: sensorfw-qt5
@@ -55,7 +64,7 @@
Section: misc
Priority: extra
Architecture: any
-Depends: sensorfw-qt5 (= ${binary:Version}), libqt5core5a, android-headers, libhardware2
+Depends: sensorfw-qt5 (= ${binary:Version}), libqt5core5a, libhardware2
Description: Sensor framework hybris support
Provides support for hybris Sensor framework backend.
@@ -63,6 +72,6 @@
Section: misc
Priority: extra
Architecture: any
-Depends: sensorfw-qt5 (= ${binary:Version}), libqt5core5a, android-headers, libhardware2
+Depends: sensorfw-qt5 (= ${binary:Version}), libqt5core5a, libhardware2
Description: Sensor framework hybris support
Provides support for hybris Sensor framework backend.
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/debian/libsensorfw-qt5-plugins.install
^
|
@@ -38,5 +38,4 @@
/usr/lib/sensord-qt5/liboaktrailaccelerometeradaptor-qt5.so
/usr/lib/sensord-qt5/libpegatronaccelerometeradaptor-qt5.so
/usr/lib/sensord-qt5/librotationsensor-qt5.so
-
-
+/usr/lib/sensord-qt5/libiiosensorsadaptor-qt5.so
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/examples/adaptorplugin/sampleadaptorplugin.cpp
^
|
@@ -37,8 +37,3 @@
// "xxxadaptor"
sm.registerDeviceAdaptor<SampleAdaptor>("sampleadaptor");
}
-
-// Plugin must be exported for it to loaded properly
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(sampleadaptor, SampleAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/examples/adaptorplugin/sampleadaptorplugin.h
^
|
@@ -31,9 +31,7 @@
class SampleAdaptorPlugin : 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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/examples/chainplugin/samplechainplugin.cpp
^
|
@@ -43,7 +43,3 @@
QStringList SampleChainPlugin::Dependencies() {
return QString("sampleadaptor:samplefilter").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(samplechain, SampleChainPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/examples/chainplugin/samplechainplugin.h
^
|
@@ -31,9 +31,7 @@
class SampleChainPlugin : 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);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/examples/filterplugin/samplefilterplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerFilter<SampleFilter>("samplefilter");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(samplefilter, SampleFilterPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/examples/filterplugin/samplefilterplugin.h
^
|
@@ -31,9 +31,7 @@
class SampleFilterPlugin : 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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/examples/sensorplugin/sampleplugin.cpp
^
|
@@ -42,7 +42,3 @@
QStringList SamplePlugin::Dependencies() {
return QString("samplechain").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(samplesensor, SamplePlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/examples/sensorplugin/sampleplugin.h
^
|
@@ -31,9 +31,7 @@
class SamplePlugin : 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);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/filters/avgaccfilter/avgaccfilterplugin.cpp
^
|
@@ -30,7 +30,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerFilter<AvgAccFilter>("avgaccfilter");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(avgaccfilter, AvgAccFilterPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/filters/avgaccfilter/avgaccfilterplugin.h
^
|
@@ -25,9 +25,7 @@
class AvgAccFilterPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0" FILE "plugin.json")
-#endif
private:
void Register(class Loader& l);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/filters/coordinatealignfilter/coordinatealignfilterplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerFilter<CoordinateAlignFilter>("coordinatealignfilter");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(coordinatealignfilter, CoordinateAlignFilterPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/filters/coordinatealignfilter/coordinatealignfilterplugin.h
^
|
@@ -31,9 +31,7 @@
class CoordinateAlignFilterPlugin : 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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/filters/declinationfilter/declinationfilter.cpp
^
|
@@ -51,13 +51,8 @@
}
newOrientation.correctedDegrees_ = newOrientation.degrees_;
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- if (declinationCorrection_) {
- newOrientation.correctedDegrees_ += declinationCorrection_;
-#else
if (declinationCorrection_.loadAcquire() != 0) {
newOrientation.correctedDegrees_ += declinationCorrection_.loadAcquire();
-#endif
newOrientation.correctedDegrees_ %= 360;
// sensordLogT() << "DeclinationFilter corrected degree " << newOrientation.degrees_ << " => " << newOrientation.correctedDegrees_ << ". Level: " << newOrientation.level_;
}
@@ -73,19 +68,11 @@
if (declination != 0) {
declinationCorrection_ = declination;
}
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- sensordLogD() << "Fetched declination correction from GConf: " << declinationCorrection_;
-#else
sensordLogD() << "Fetched declination correction from GConf: " << declinationCorrection_.loadAcquire();
-#endif
}
int DeclinationFilter::declinationCorrection()
{
loadSettings();
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- return declinationCorrection_;
-#else
return declinationCorrection_.loadAcquire();
-#endif
}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/filters/declinationfilter/declinationfilterplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerFilter<DeclinationFilter>("declinationfilter");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(declinationfilter, DeclinationFilterPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/filters/declinationfilter/declinationfilterplugin.h
^
|
@@ -31,9 +31,7 @@
class DeclinationFilterPlugin : 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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/filters/downsamplefilter/downsamplefilterplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerFilter<DownsampleFilter>("downsamplefilter");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(downsamplefilter, DownsampleFilterPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/filters/downsamplefilter/downsamplefilterplugin.h
^
|
@@ -31,9 +31,7 @@
class DownsampleFilterPlugin : 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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/filters/magcoordinatealignfilter/magcoordinatealignfilterplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerFilter<MagCoordinateAlignFilter>("magcoordinatealignfilter");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magcoordinatealignfilter, MagCoordinateAlignFilterPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/filters/magcoordinatealignfilter/magcoordinatealignfilterplugin.h
^
|
@@ -31,9 +31,7 @@
class MagCoordinateAlignFilterPlugin : 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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/filters/orientationinterpreter/orientationinterpreterplugin.cpp
^
|
@@ -35,7 +35,3 @@
sensordLogD() << "registering orientationinterpreter";
sm.registerFilter<OrientationInterpreter>("orientationinterpreter");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(orientationinterpreter, OrientationInterpreterPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/filters/orientationinterpreter/orientationinterpreterplugin.h
^
|
@@ -31,9 +31,7 @@
class OrientationInterpreterPlugin : 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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/filters/rotationfilter/rotationfilterplugin.cpp
^
|
@@ -35,7 +35,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerFilter<RotationFilter>("rotationfilter");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(rotationfilter, RotationFilterPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/filters/rotationfilter/rotationfilterplugin.h
^
|
@@ -31,9 +31,7 @@
class RotationFilterPlugin : 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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/qt-api/abstractsensor_i.cpp
^
|
@@ -39,11 +39,7 @@
{
AbstractSensorChannelInterfaceImpl(QObject* parent, int sessionId, const QString& path, const char* interfaceName);
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- void dbusConnectNotify(const char* signal) { QDBusAbstractInterface::connectNotify(signal); }
-#else
void dbusConnectNotify(const QMetaMethod& signal) { QDBusAbstractInterface::connectNotify(signal); }
-#endif
SensorError errorCode_;
QString errorString_;
int sessionId_;
@@ -489,11 +485,7 @@
return pimpl_->call(mode, method, args);
}
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-void AbstractSensorChannelInterface::dbusConnectNotify(const char* signal)
-#else
void AbstractSensorChannelInterface::dbusConnectNotify(const QMetaMethod& signal)
-#endif
{
pimpl_->dbusConnectNotify(signal);
}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/qt-api/abstractsensor_i.h
^
|
@@ -466,11 +466,7 @@
* Wrapper for function of QDBusAbstractInterface.
* For more details see QDBusAbstractInterface docs.
*/
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- void dbusConnectNotify(const char* signal);
-#else
void dbusConnectNotify(const QMetaMethod& signal);
-#endif
protected slots:
void startFinished(QDBusPendingCallWatcher *watch);
void stopFinished(QDBusPendingCallWatcher *watch);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/qt-api/accelerometersensor_i.cpp
^
|
@@ -86,18 +86,10 @@
return getAccessor<XYZ>("xyz");
}
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-void AccelerometerSensorChannelInterface::connectNotify(const char* signal)
-#else
void AccelerometerSensorChannelInterface::connectNotify(const QMetaMethod &signal)
-#endif
{
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- if(QLatin1String(signal) == SIGNAL(frameAvailable(QVector<XYZ>)))
-#else
static const QMetaMethod frameAvailableSignal = QMetaMethod::fromSignal(&AccelerometerSensorChannelInterface::frameAvailable);
if(signal == frameAvailableSignal)
-#endif
frameAvailableConnected = true;
dbusConnectNotify(signal);
}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/qt-api/accelerometersensor_i.h
^
|
@@ -99,12 +99,8 @@
protected:
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- virtual void connectNotify(const char* signal);
-#else
virtual void connectNotify(const QMetaMethod & signal);
-#endif
-virtual bool dataReceivedImpl();
+ virtual bool dataReceivedImpl();
private:
bool frameAvailableConnected; /**< has applicaiton connected slot for frameAvailable signal. */
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/qt-api/gyroscopesensor_i.cpp
^
|
@@ -86,18 +86,10 @@
return true;
}
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-void GyroscopeSensorChannelInterface::connectNotify(const char* signal)
-#else
void GyroscopeSensorChannelInterface::connectNotify(const QMetaMethod &signal)
-#endif
{
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- if(QLatin1String(signal) == SIGNAL(frameAvailable(QVector<XYZ>)))
-#else
static const QMetaMethod frameAvailableSignal = QMetaMethod::fromSignal(&GyroscopeSensorChannelInterface::frameAvailable);
if(signal == frameAvailableSignal)
-#endif
frameAvailableConnected = true;
dbusConnectNotify(signal);
}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/qt-api/gyroscopesensor_i.h
^
|
@@ -99,11 +99,7 @@
static GyroscopeSensorChannelInterface* interface(const QString& id);
protected:
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- virtual void connectNotify(const char* signal);
-#else
virtual void connectNotify(const QMetaMethod & signal);
-#endif
virtual bool dataReceivedImpl();
private:
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/qt-api/magnetometersensor_i.cpp
^
|
@@ -83,18 +83,10 @@
return true;
}
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-void MagnetometerSensorChannelInterface::connectNotify(const char* signal)
-#else
void MagnetometerSensorChannelInterface::connectNotify(const QMetaMethod &signal)
-#endif
{
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- if(QLatin1String(signal) == SIGNAL(frameAvailable(QVector<XYZ>)))
-#else
static const QMetaMethod frameAvailableSignal = QMetaMethod::fromSignal(&MagnetometerSensorChannelInterface::frameAvailable);
if(signal == frameAvailableSignal)
-#endif
frameAvailableConnected = true;
dbusConnectNotify(signal);
}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/qt-api/magnetometersensor_i.h
^
|
@@ -100,11 +100,7 @@
static MagnetometerSensorChannelInterface* interface(const QString& id);
protected:
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- virtual void connectNotify(const char* signal);
-#else
virtual void connectNotify(const QMetaMethod & signal);
-#endif
virtual bool dataReceivedImpl();
private:
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/qt-api/qt-api.pro
^
|
@@ -50,12 +50,9 @@
DEPENDPATH += $$SENSORFW_INCLUDEPATHS
INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
-equals(QT_MAJOR_VERSION, 4): {
- QMAKE_LIBDIR_FLAGS += -L../datatypes -lsensordatatypes
-}
-equals(QT_MAJOR_VERSION, 5): {
- QMAKE_LIBDIR_FLAGS += -L../datatypes -lsensordatatypes-qt5
-}
+
+QMAKE_LIBDIR_FLAGS += -L../datatypes -lsensordatatypes-qt5
+
include(../common-install.pri)
publicheaders.files = $$HEADERS
target.path = $$SHAREDLIBPATH
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/qt-api/rotationsensor_i.cpp
^
|
@@ -92,18 +92,10 @@
return getAccessor<bool>("hasZ");
}
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-void RotationSensorChannelInterface::connectNotify(const char* signal)
-#else
void RotationSensorChannelInterface::connectNotify(const QMetaMethod &signal)
-#endif
{
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- if(QLatin1String(signal) == SIGNAL(frameAvailable(QVector<XYZ>)))
-#else
static const QMetaMethod frameAvailableSignal = QMetaMethod::fromSignal(&RotationSensorChannelInterface::frameAvailable);
if(signal == frameAvailableSignal)
-#endif
frameAvailableConnected = true;
dbusConnectNotify(signal);
}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/qt-api/rotationsensor_i.h
^
|
@@ -109,11 +109,7 @@
static RotationSensorChannelInterface* interface(const QString& id);
protected:
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
- virtual void connectNotify(const char* signal);
-#else
virtual void connectNotify(const QMetaMethod &signal);
-#endif
virtual bool dataReceivedImpl();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/qt-api/sensormanager_i.cpp
^
|
@@ -31,9 +31,6 @@
#include "sensormanager_i.h"
#include <QAbstractSocket>
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_DECLARE_METATYPE( QAbstractSocket::SocketState)
-#endif
void __attribute__ ((constructor)) qtapi_init(void)
{
qRegisterMetaType<QAbstractSocket::SocketState>("SocketState");
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensord-qt5.pc
^
|
@@ -4,7 +4,7 @@
Name: Sensorfw-qt5
Description: Sensord for Qt 5
-Version: 0.7.2.1
+Version: 0.11.6
Requires:
Libs: -L${libdir} -lsensorclient-qt5 -lsensordatatypes-qt5
Cflags: -I${includedir} -I${includedir}/datatypes -I${includedir}/filters
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensord.prf
^
|
@@ -1,13 +1,5 @@
-equals(QT_MAJOR_VERSION, 4):{
- LIBS += -L/usr/lib/ -lsensorclient -lsensordatatypes
- DEPENDPATH += /usr/include/sensord
- INCLUDEPATH += /usr/include/sensord /usr/include/sensord/datatypes /usr/include/sensord/filters
-}
-
-equals(QT_MAJOR_VERSION, 5):{
- LIBS += -L/usr/lib/ -lsensorclient-qt5 -lsensordatatypes-qt5
- DEPENDPATH += /usr/include/sensord-qt5
- INCLUDEPATH += /usr/include/sensord-qt5 /usr/include/sensord-qt5/datatypes /usr/include/sensord-qt5/filters
-}
+LIBS += -L/usr/lib/ -lsensorclient-qt5 -lsensordatatypes-qt5
+DEPENDPATH += /usr/include/sensord-qt5
+INCLUDEPATH += /usr/include/sensord-qt5 /usr/include/sensord-qt5/datatypes /usr/include/sensord-qt5/filters
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensord/main.cpp
^
|
@@ -169,7 +169,6 @@
{
Q_UNUSED(socket);
int sig = SIGTERM;
- uint64_t tmp = 0;
if (read(s_pipe[0], &sig, sizeof sig) == -1) {
// dontcare
}
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensord/sensord.pro
^
|
@@ -23,12 +23,7 @@
QMAKE_LIBDIR_FLAGS += -L../datatypes \
-L../core
-equals(QT_MAJOR_VERSION, 4):{
- TARGET_H.path += /usr/include/sensord
-}
-equals(QT_MAJOR_VERSION, 5):{
- TARGET_H.path += /usr/include/sensord-qt5
-}
+TARGET_H.path += /usr/include/sensord-qt5
SOURCES += main.cpp \
parser.cpp \
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensorfw.pro
^
|
@@ -26,10 +26,6 @@
tests \
examples
-equals(QT_MAJOR_VERSION, 4): {
- SUBDIRS = datatypes qt-api
-}
-
contains(CONFIG,configs) {
# !contains(CONFIG,hybris) {
SENSORDHYBRISCONFIGFILE.files = config/sensord-hybris.conf
@@ -79,54 +75,36 @@
include( common-install.pri )
include( common-config.pri )
- equals(QT_MAJOR_VERSION, 4):{
- PKGCONFIGFILES.files = sensord.pc
- PKGCONFIGFILES.commands = 'sed -i "s/Version:.*/Version: $$PC_VERSION/" sensord.pc'
- QTCONFIGFILES.path = /usr/share/qt4/mkspecs/features
- }
-
- equals(QT_MAJOR_VERSION, 5):{
- PKGCONFIGFILES.files = sensord-qt5.pc
- PKGCONFIGFILES.commands = 'sed -i "s/Version:.*/Version: $$PC_VERSION/" sensord-qt5.pc'
- QTCONFIGFILES.path = /usr/share/qt5/mkspecs/features
-
- }
+ PKGCONFIGFILES.files = sensord-qt5.pc
+ PKGCONFIGFILES.commands = 'sed -i "s/Version:.*/Version: $$PC_VERSION/" $$_PRO_FILE_PWD_/sensord-qt5.pc'
+ QTCONFIGFILES.path = /usr/share/qt5/mkspecs/features
}
# How to make this work in all cases?
-#PKGCONFIGFILES.commands = sed -i \"s/Version:.*$$/Version: `head -n1 debian/changelog | cut -f 2 -d\' \' | tr -d \'()\'`/\" sensord.pc
+#PKGCONFIGFILES.commands = sed -i \"s/Version:.*$$/Version: `head -n1 debian/changelog | cut -f 2 -d\' \' | tr -d \'()\'`/\" sensord-qt5.pc
-equals(QT_MAJOR_VERSION, 5): {
- !contains(CONFIG,hybris) {
+!contains(CONFIG,hybris) {
# config file installation not handled here
- DBUSCONFIGFILES.files = sensorfw.conf
- DBUSCONFIGFILES.path = /etc/dbus-1/system.d
- INSTALLS += DBUSCONFIGFILES
-
- SENSORDCONFIGFILES.files = config/10-sensord-default.conf
- SENSORDCONFIGFILES.files += config/20-sensors-default.conf
- SENSORDCONFIGFILES.path = /etc/sensorfw/sensord.conf.d
- INSTALLS += SENSORDCONFIGFILES
-
- SENSORSYSTEMD.files = rpm/sensorfwd.service
- SENSORSYSTEMD.path = /lib/systemd/system
- INSTALLS += SENSORSYSTEMD
- }
+ DBUSCONFIGFILES.files = sensorfw.conf
+ DBUSCONFIGFILES.path = /etc/dbus-1/system.d
+ INSTALLS += DBUSCONFIGFILES
+
+ SENSORDCONFIGFILES.files = config/10-sensord-default.conf
+ SENSORDCONFIGFILES.files += config/20-sensors-default.conf
+ SENSORDCONFIGFILES.path = /etc/sensorfw/sensord.conf.d
+ INSTALLS += SENSORDCONFIGFILES
+
+ SENSORSYSTEMD.files = rpm/sensorfwd.service
+ SENSORSYSTEMD.path = /lib/systemd/system
+ INSTALLS += SENSORSYSTEMD
}
-equals(QT_MAJOR_VERSION, 4): {
- OTHER_FILES += rpm/sensorfw.spec \
- rpm/sensorfw.yaml
-}
+OTHER_FILES += rpm/sensorfw-qt5.spec \
+ rpm/sensorfw-qt5-binder.spec \
+ rpm/sensorfw-qt5-hybris.inc \
+ rpm/sensorfw-qt5-hybris.spec
-equals(QT_MAJOR_VERSION, 5): {
- OTHER_FILES += rpm/sensorfw-qt5.spec \
- rpm/sensorfw-qt5.yaml
- OTHER_FILES += rpm/sensorfw-qt5-hybris.spec \
- rpm/sensorfw-qt5-hybris.yaml
-
-}
OTHER_FILES += config/*
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/accelerometersensor/accelerometerplugin.cpp
^
|
@@ -39,7 +39,3 @@
QStringList AccelerometerPlugin::Dependencies() {
return QString("accelerometerchain").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(accelerometersensor, AccelerometerPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/accelerometersensor/accelerometerplugin.h
^
|
@@ -31,9 +31,7 @@
class AccelerometerPlugin : 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);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/alssensor/alsplugin.cpp
^
|
@@ -45,7 +45,3 @@
QStringList ALSPlugin::Dependencies() {
return QString("alsadaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alssensor, ALSPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/alssensor/alsplugin.h
^
|
@@ -31,9 +31,7 @@
class ALSPlugin : 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);
void Init(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/compasssensor/compassplugin.cpp
^
|
@@ -39,7 +39,3 @@
QStringList CompassPlugin::Dependencies() {
return QString("compasschain").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(compasssensor, CompassPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/compasssensor/compassplugin.h
^
|
@@ -31,9 +31,7 @@
class CompassPlugin : 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);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/contextplugin/contextplugin.cpp
^
|
@@ -50,7 +50,3 @@
{
return sessionId;
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(contextsensor, ContextPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/contextplugin/contextplugin.h
^
|
@@ -30,9 +30,7 @@
class ContextPlugin : public Plugin
{
Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
public:
static int getSessionId();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/gyroscopesensor/gyroscopeplugin.cpp
^
|
@@ -39,7 +39,3 @@
QStringList GyroscopePlugin::Dependencies() {
return QString("gyroscopeadaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(gyroscopesensor, GyroscopePlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/gyroscopesensor/gyroscopeplugin.h
^
|
@@ -32,9 +32,7 @@
class GyroscopePlugin : 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);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/humiditysensor/humidityplugin.cpp
^
|
@@ -44,7 +44,3 @@
QStringList HumidityPlugin::Dependencies() {
return QString("humidityadaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(humiditysensor, HumidityPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/humiditysensor/humidityplugin.h
^
|
@@ -31,9 +31,7 @@
class HumidityPlugin : 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);
void Init(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/lidsensor/lidplugin.cpp
^
|
@@ -44,7 +44,3 @@
QStringList LidPlugin::Dependencies() {
return QString("lidsensoradaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(lidsensor, LidPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/lidsensor/lidplugin.h
^
|
@@ -30,9 +30,7 @@
class LidPlugin : 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);
void Init(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/magnetometersensor/magnetometerplugin.cpp
^
|
@@ -39,7 +39,3 @@
QStringList MagnetometerPlugin::Dependencies() {
return QString("magcalibrationchain").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magnetometersensor, MagnetometerPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/magnetometersensor/magnetometerplugin.h
^
|
@@ -31,9 +31,7 @@
class MagnetometerPlugin : 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);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/orientationsensor/orientationplugin.cpp
^
|
@@ -39,7 +39,3 @@
QStringList OrientationPlugin::Dependencies() {
return QString("orientationchain").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(orientationsensor, OrientationPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/orientationsensor/orientationplugin.h
^
|
@@ -31,9 +31,7 @@
class OrientationPlugin : 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);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/pressuresensor/pressureplugin.cpp
^
|
@@ -44,7 +44,3 @@
QStringList PressurePlugin::Dependencies() {
return QString("pressureadaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(pressuresensor, PressurePlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/pressuresensor/pressureplugin.h
^
|
@@ -31,9 +31,7 @@
class PressurePlugin : 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);
void Init(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/proximitysensor/proximityplugin.cpp
^
|
@@ -38,7 +38,3 @@
QStringList ProximityPlugin::Dependencies() {
return QString("proximityadaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(proximitysensor, ProximityPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/proximitysensor/proximityplugin.h
^
|
@@ -31,9 +31,7 @@
class ProximityPlugin : 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);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/rotationsensor/rotationplugin.cpp
^
|
@@ -38,7 +38,3 @@
QStringList RotationPlugin::Dependencies() {
return QString("accelerometerchain:rotationfilter:compasschain").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(rotationsensor, RotationPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/rotationsensor/rotationplugin.h
^
|
@@ -31,9 +31,7 @@
class RotationPlugin : 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);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/stepcountersensor/stepcounterplugin.cpp
^
|
@@ -47,7 +47,3 @@
QStringList StepCounterPlugin::Dependencies() {
return QString("stepcounteradaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(stepcountersensor, StepCounterPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/stepcountersensor/stepcounterplugin.h
^
|
@@ -33,9 +33,7 @@
class StepCounterPlugin : 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);
void Init(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/tapsensor/tapplugin.cpp
^
|
@@ -39,7 +39,3 @@
QStringList TapPlugin::Dependencies() {
return QString("tapadaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(tapsensor, TapPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/tapsensor/tapplugin.h
^
|
@@ -31,9 +31,7 @@
class TapPlugin : 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);
QStringList Dependencies();
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/temperaturesensor/temperatureplugin.cpp
^
|
@@ -44,7 +44,3 @@
QStringList TemperaturePlugin::Dependencies() {
return QString("temperatureadaptor").split(":", QString::SkipEmptyParts);
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(temperaturesensor, TemperaturePlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/sensors/temperaturesensor/temperatureplugin.h
^
|
@@ -31,9 +31,7 @@
class TemperaturePlugin : 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);
void Init(class Loader& l);
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/tests/benchmark/benchmarktest/benchmarktest.pro
^
|
@@ -25,9 +25,4 @@
-L../../../datatypes \
-L../../../core
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
-}
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/tests/benchmark/dummyclient/dummyclient.pro
^
|
@@ -16,9 +16,4 @@
-L../../../datatypes \
-L../../../core
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
-}
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/tests/benchmark/fakeadaptor/fakeadaptorplugin.cpp
^
|
@@ -34,7 +34,3 @@
SensorManager& sm = SensorManager::instance();
sm.registerDeviceAdaptor<FakeAdaptor>("alsadaptor");
}
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alsadaptor, FakeAdaptorPlugin)
-#endif
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/tests/benchmark/fakeadaptor/fakeadaptorplugin.h
^
|
@@ -31,9 +31,7 @@
class FakeAdaptorPlugin : 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);
};
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/tests/client/client.pro
^
|
@@ -24,9 +24,5 @@
QMAKE_LIBDIR_FLAGS += -L../../qt-api \
-L../../datatypes
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
-}
+
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/tests/common-install.pri
^
|
@@ -3,12 +3,8 @@
include(../common-config.pri)
QMAKE_LIBDIR_FLAGS += -L../../datatypes -L../../../datatypes
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5
-}
+
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5
target.path = /usr/bin
INSTALLS += target
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/tests/deadclient/deadclient.pro
^
|
@@ -15,12 +15,8 @@
QMAKE_LIBDIR_FLAGS += -L../../qt-api \
-L../../datatypes
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
-}
+
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
# Input
HEADERS += datareceiver.h testwindow.h
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/tests/metadata/metadata.pro
^
|
@@ -22,12 +22,8 @@
QMAKE_LIBDIR_FLAGS += -L../../qt-api \
-L../../datatypes
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
-}
+
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
#CONFIG += link_pkgconfig
#PKGCONFIG += mlite5
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/tests/powermanagement/driverpolltest/driverpolltest.pro
^
|
@@ -24,9 +24,4 @@
-L../../../datatypes\
-L../../../core
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
-}
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/tests/powermanagement/powermanagementtests/powermanagementtests.pro
^
|
@@ -24,12 +24,7 @@
-L../../../datatypes\
-L../../../core
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
-}
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
#CONFIG += link_pkgconfig
#PKGCONFIG += mlite5
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/tests/powermanagement/standbyoverridetests/standbyoverridetests.pro
^
|
@@ -25,12 +25,7 @@
-L../../../datatypes\
-L../../../core
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
-}
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
-}
+QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
#CONFIG += link_pkgconfig
#PKGCONFIG += mlite5
|
[-]
[+]
|
Changed |
_service:tar_git:hybris-libsensorfw-qt5-hal-0.11.8.tar.bz2/tests/testapp/testapp.pro
^
|
@@ -36,13 +36,7 @@
-L../../datatypes \
-L../../core
-equals(QT_MAJOR_VERSION, 4):{
- QMAKE_LIBDIR_FLAGS += -lsensorclient
-}
-
-equals(QT_MAJOR_VERSION, 5):{
- QMAKE_LIBDIR_FLAGS += -lsensorclient-qt5
-}
+QMAKE_LIBDIR_FLAGS += -lsensorclient-qt5
include(../../common.pri)
|
[-]
[+]
|
Changed |
_service:tar_git:sensorfwd.service
^
|
@@ -11,6 +11,11 @@
ExecReload=/bin/kill -HUP $MAINPID
Restart=always
RestartSec=1
+# Sandboxing
+CapabilityBoundingSet=CAP_BLOCK_SUSPEND CAP_DAC_OVERRIDE CAP_FOWNER
+PrivateTmp=yes
+ProtectHome=yes
+ProtectSystem=full
[Install]
WantedBy=graphical.target
|