diff --git a/adaptors/accelerometeradaptor/accelerometeradaptorplugin.cpp b/adaptors/accelerometeradaptor/accelerometeradaptorplugin.cpp
index a38179f6..5e0e7d1d 100644
--- a/adaptors/accelerometeradaptor/accelerometeradaptorplugin.cpp
+++ b/adaptors/accelerometeradaptor/accelerometeradaptorplugin.cpp
@@ -34,7 +34,3 @@ void AccelerometerAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<AccelerometerAdaptor>("accelerometeradaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(accelerometeradaptor, AccelerometerAdaptorPlugin)
-#endif
diff --git a/adaptors/accelerometeradaptor/accelerometeradaptorplugin.h b/adaptors/accelerometeradaptor/accelerometeradaptorplugin.h
index 3806579d..73f3c698 100644
--- a/adaptors/accelerometeradaptor/accelerometeradaptorplugin.h
+++ b/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);
 };
diff --git a/adaptors/alsadaptor-ascii/alsadaptor-asciiplugin.cpp b/adaptors/alsadaptor-ascii/alsadaptor-asciiplugin.cpp
index 09cc7454..c4cad871 100644
--- a/adaptors/alsadaptor-ascii/alsadaptor-asciiplugin.cpp
+++ b/adaptors/alsadaptor-ascii/alsadaptor-asciiplugin.cpp
@@ -39,7 +39,3 @@ void ALSAdaptorAsciiPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<ALSAdaptorAscii>("alsadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alsadaptor, ALSAdaptorAsciiPlugin)
-#endif
diff --git a/adaptors/alsadaptor-ascii/alsadaptor-asciiplugin.h b/adaptors/alsadaptor-ascii/alsadaptor-asciiplugin.h
index 3cc29bce..d72fedb6 100644
--- a/adaptors/alsadaptor-ascii/alsadaptor-asciiplugin.h
+++ b/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);
 };
diff --git a/adaptors/alsadaptor-evdev/alsadaptor-evdevplugin.cpp b/adaptors/alsadaptor-evdev/alsadaptor-evdevplugin.cpp
index c1bf97ee..8ff54913 100644
--- a/adaptors/alsadaptor-evdev/alsadaptor-evdevplugin.cpp
+++ b/adaptors/alsadaptor-evdev/alsadaptor-evdevplugin.cpp
@@ -37,7 +37,3 @@ void ALSAdaptorEvdevPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<ALSAdaptorEvdev>("alsadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alsadaptor-evdev, ALSAdaptorEvdevPlugin)
-#endif
diff --git a/adaptors/alsadaptor-evdev/alsadaptor-evdevplugin.h b/adaptors/alsadaptor-evdev/alsadaptor-evdevplugin.h
index a08f325e..11e40e83 100644
--- a/adaptors/alsadaptor-evdev/alsadaptor-evdevplugin.h
+++ b/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);
diff --git a/adaptors/alsadaptor-sysfs/alsadaptor-sysfsplugin.cpp b/adaptors/alsadaptor-sysfs/alsadaptor-sysfsplugin.cpp
index d4a9f589..107eb945 100644
--- a/adaptors/alsadaptor-sysfs/alsadaptor-sysfsplugin.cpp
+++ b/adaptors/alsadaptor-sysfs/alsadaptor-sysfsplugin.cpp
@@ -35,7 +35,3 @@ void ALSAdaptorSysfsPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<ALSAdaptorSysfs>("alsadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alsadaptor-sysfs, ALSAdaptorSysfsPlugin)
-#endif
diff --git a/adaptors/alsadaptor-sysfs/alsadaptor-sysfsplugin.h b/adaptors/alsadaptor-sysfs/alsadaptor-sysfsplugin.h
index 96f619ff..fca55ca9 100644
--- a/adaptors/alsadaptor-sysfs/alsadaptor-sysfsplugin.h
+++ b/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);
diff --git a/adaptors/alsadaptor/alsadaptorplugin.cpp b/adaptors/alsadaptor/alsadaptorplugin.cpp
index 3b116162..59ebdc72 100644
--- a/adaptors/alsadaptor/alsadaptorplugin.cpp
+++ b/adaptors/alsadaptor/alsadaptorplugin.cpp
@@ -34,7 +34,3 @@ void ALSAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<ALSAdaptor>("alsadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alsadaptor, ALSAdaptorPlugin)
-#endif
diff --git a/adaptors/alsadaptor/alsadaptorplugin.h b/adaptors/alsadaptor/alsadaptorplugin.h
index 37b5b5cc..63219170 100644
--- a/adaptors/alsadaptor/alsadaptorplugin.h
+++ b/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);
 };
diff --git a/adaptors/gyroscopeadaptor-evdev/gyroadaptor-evdevplugin.cpp b/adaptors/gyroscopeadaptor-evdev/gyroadaptor-evdevplugin.cpp
index 24006c63..c2e4bfa6 100644
--- a/adaptors/gyroscopeadaptor-evdev/gyroadaptor-evdevplugin.cpp
+++ b/adaptors/gyroscopeadaptor-evdev/gyroadaptor-evdevplugin.cpp
@@ -37,7 +37,3 @@ void GyroAdaptorEvdevPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<GyroAdaptorEvdev>("gyroscopeadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(gyroadaptor-evdev, GyroAdaptorEvdevPlugin)
-#endif
diff --git a/adaptors/gyroscopeadaptor-evdev/gyroadaptor-evdevplugin.h b/adaptors/gyroscopeadaptor-evdev/gyroadaptor-evdevplugin.h
index 7d9628b2..ec6a650c 100644
--- a/adaptors/gyroscopeadaptor-evdev/gyroadaptor-evdevplugin.h
+++ b/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);
diff --git a/adaptors/gyroscopeadaptor/gyroscopeadaptorplugin.cpp b/adaptors/gyroscopeadaptor/gyroscopeadaptorplugin.cpp
index 7915e2b3..c6e7f9dd 100644
--- a/adaptors/gyroscopeadaptor/gyroscopeadaptorplugin.cpp
+++ b/adaptors/gyroscopeadaptor/gyroscopeadaptorplugin.cpp
@@ -34,7 +34,3 @@ void GyroscopeAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<GyroscopeAdaptor>("gyroscopeadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(gyroscopeadaptor, GyroscopeAdaptorPlugin)
-#endif
diff --git a/adaptors/gyroscopeadaptor/gyroscopeadaptorplugin.h b/adaptors/gyroscopeadaptor/gyroscopeadaptorplugin.h
index f1feae1f..2b03b628 100644
--- a/adaptors/gyroscopeadaptor/gyroscopeadaptorplugin.h
+++ b/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);
 };
diff --git a/adaptors/humidityadaptor/humidityadaptorplugin.cpp b/adaptors/humidityadaptor/humidityadaptorplugin.cpp
index 09cd92f1..a133a3dc 100644
--- a/adaptors/humidityadaptor/humidityadaptorplugin.cpp
+++ b/adaptors/humidityadaptor/humidityadaptorplugin.cpp
@@ -34,7 +34,3 @@ void HumidityAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<HumidityAdaptor>("humidityadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(humidityadaptor, HumidityAdaptorPlugin)
-#endif
diff --git a/adaptors/humidityadaptor/humidityadaptorplugin.h b/adaptors/humidityadaptor/humidityadaptorplugin.h
index 6f376b95..3c200ceb 100644
--- a/adaptors/humidityadaptor/humidityadaptorplugin.h
+++ b/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);
diff --git a/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptorplugin.cpp b/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptorplugin.cpp
index 03ff532f..0bc76450 100644
--- a/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptorplugin.cpp
+++ b/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptorplugin.cpp
@@ -29,7 +29,3 @@ void HybrisAccelerometerAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<HybrisAccelerometerAdaptor>("accelerometeradaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrisaccelerometeradaptor, HybrisAccelerometerAdaptorPlugin)
-#endif
diff --git a/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptorplugin.h b/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptorplugin.h
index c92c52ab..93727245 100644
--- a/adaptors/hybrisaccelerometer/hybrisaccelerometeradaptorplugin.h
+++ b/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);
diff --git a/adaptors/hybrisalsadaptor/hybrisalsadaptorplugin.cpp b/adaptors/hybrisalsadaptor/hybrisalsadaptorplugin.cpp
index e6e3f21a..76d90d6f 100644
--- a/adaptors/hybrisalsadaptor/hybrisalsadaptorplugin.cpp
+++ b/adaptors/hybrisalsadaptor/hybrisalsadaptorplugin.cpp
@@ -29,7 +29,3 @@ void HybrisAlsAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<HybrisAlsAdaptor>("alsadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrisalsadaptor, HybrisAlsAdaptorPlugin)
-#endif
diff --git a/adaptors/hybrisalsadaptor/hybrisalsadaptorplugin.h b/adaptors/hybrisalsadaptor/hybrisalsadaptorplugin.h
index 4e20e05e..fe374ffa 100644
--- a/adaptors/hybrisalsadaptor/hybrisalsadaptorplugin.h
+++ b/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);
diff --git a/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptorplugin.cpp b/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptorplugin.cpp
index 1a2ce9d1..76e9ffdb 100644
--- a/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptorplugin.cpp
+++ b/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptorplugin.cpp
@@ -29,7 +29,3 @@ void HybrisGyroscopeAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<HybrisGyroscopeAdaptor>("gyroscopeadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrisgyroscopeadaptor, HybrisGyroscopeAdaptorPlugin)
-#endif
diff --git a/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptorplugin.h b/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptorplugin.h
index b1068bc9..56b7aa45 100644
--- a/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptorplugin.h
+++ b/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);
diff --git a/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptorplugin.cpp b/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptorplugin.cpp
index afdc76ca..ec9e704d 100644
--- a/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptorplugin.cpp
+++ b/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptorplugin.cpp
@@ -29,7 +29,3 @@ void HybrisMagnetometerAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<HybrisMagnetometerAdaptor>("magnetometeradaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrismagnetometeradaptor, HybrisMagnetometerAdaptorPlugin)
-#endif
diff --git a/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptorplugin.h b/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptorplugin.h
index 51b3ab7c..59748a5b 100644
--- a/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptorplugin.h
+++ b/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);
diff --git a/adaptors/hybrisorientationadaptor/hybrisorientationadaptorplugin.cpp b/adaptors/hybrisorientationadaptor/hybrisorientationadaptorplugin.cpp
index 033f7b90..d57b7054 100644
--- a/adaptors/hybrisorientationadaptor/hybrisorientationadaptorplugin.cpp
+++ b/adaptors/hybrisorientationadaptor/hybrisorientationadaptorplugin.cpp
@@ -29,7 +29,3 @@ void HybrisOrientationAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<HybrisOrientationAdaptor>("orientationadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrisorientationadaptor, HybrisOrientationAdaptorPlugin)
-#endif
diff --git a/adaptors/hybrisorientationadaptor/hybrisorientationadaptorplugin.h b/adaptors/hybrisorientationadaptor/hybrisorientationadaptorplugin.h
index 795ffe68..ffd7e673 100644
--- a/adaptors/hybrisorientationadaptor/hybrisorientationadaptorplugin.h
+++ b/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);
diff --git a/adaptors/hybrispressureadaptor/hybrispressureadaptorplugin.cpp b/adaptors/hybrispressureadaptor/hybrispressureadaptorplugin.cpp
index c3ab5eeb..8cc35a3c 100644
--- a/adaptors/hybrispressureadaptor/hybrispressureadaptorplugin.cpp
+++ b/adaptors/hybrispressureadaptor/hybrispressureadaptorplugin.cpp
@@ -31,7 +31,3 @@ void HybrisPressureAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<HybrisPressureAdaptor>("pressureadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrispressureadaptor, HybrisPressureAdaptorPlugin)
-#endif
diff --git a/adaptors/hybrispressureadaptor/hybrispressureadaptorplugin.h b/adaptors/hybrispressureadaptor/hybrispressureadaptorplugin.h
index 35e0f024..44d904de 100644
--- a/adaptors/hybrispressureadaptor/hybrispressureadaptorplugin.h
+++ b/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);
diff --git a/adaptors/hybrisproximityadaptor/hybrisproximityadaptorplugin.cpp b/adaptors/hybrisproximityadaptor/hybrisproximityadaptorplugin.cpp
index 1c4cfdc4..40efd5f2 100644
--- a/adaptors/hybrisproximityadaptor/hybrisproximityadaptorplugin.cpp
+++ b/adaptors/hybrisproximityadaptor/hybrisproximityadaptorplugin.cpp
@@ -29,7 +29,3 @@ void HybrisProximityAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<HybrisProximityAdaptor>("proximityadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrisproximityadaptor, HybrisProximityAdaptorPlugin)
-#endif
diff --git a/adaptors/hybrisproximityadaptor/hybrisproximityadaptorplugin.h b/adaptors/hybrisproximityadaptor/hybrisproximityadaptorplugin.h
index cbfa9431..625b3cbd 100644
--- a/adaptors/hybrisproximityadaptor/hybrisproximityadaptorplugin.h
+++ b/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);
diff --git a/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptorplugin.cpp b/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptorplugin.cpp
index 79d935b4..d0f17432 100644
--- a/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptorplugin.cpp
+++ b/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptorplugin.cpp
@@ -32,7 +32,3 @@ void HybrisStepCounterAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<HybrisStepCounterAdaptor>("stepcounteradaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(hybrisstepcounteradaptor, HybrisStepCounterAdaptorPlugin)
-#endif
diff --git a/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptorplugin.h b/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptorplugin.h
index 3a4a71b2..c8f2b846 100644
--- a/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptorplugin.h
+++ b/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);
diff --git a/adaptors/iioadaptor/iioadaptorplugin.cpp b/adaptors/iioadaptor/iioadaptorplugin.cpp
index d3b3b8f2..83306c1b 100644
--- a/adaptors/iioadaptor/iioadaptorplugin.cpp
+++ b/adaptors/iioadaptor/iioadaptorplugin.cpp
@@ -38,7 +38,3 @@ void IioAdaptorPlugin::Register(class Loader&)
     sm.registerDeviceAdaptor<IioAdaptor>("alsadaptor");
     sm.registerDeviceAdaptor<IioAdaptor>("proximityadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(iioadaptor, IioAdaptorPlugin)
-#endif
diff --git a/adaptors/iioadaptor/iioadaptorplugin.h b/adaptors/iioadaptor/iioadaptorplugin.h
index dd1ee3bc..2df1096f 100644
--- a/adaptors/iioadaptor/iioadaptorplugin.h
+++ b/adaptors/iioadaptor/iioadaptorplugin.h
@@ -32,9 +32,7 @@ r <lorn.potter@canonical.com>
 class IioAdaptorPlugin : public Plugin
 {
     Q_OBJECT
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     Q_PLUGIN_METADATA(IID "com.nokia.SensorService.Plugin/1.0")
-#endif
 
 private:
     void Register(class Loader& l);
diff --git a/adaptors/kbslideradaptor/kbslideradaptorplugin.cpp b/adaptors/kbslideradaptor/kbslideradaptorplugin.cpp
index a52508cd..0e4d3827 100644
--- a/adaptors/kbslideradaptor/kbslideradaptorplugin.cpp
+++ b/adaptors/kbslideradaptor/kbslideradaptorplugin.cpp
@@ -34,7 +34,3 @@ void KeyboardSliderAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<KeyboardSliderAdaptor>("kbslideradaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(kbslideradaptor, KeyboardSliderAdaptorPlugin)
-#endif
diff --git a/adaptors/kbslideradaptor/kbslideradaptorplugin.h b/adaptors/kbslideradaptor/kbslideradaptorplugin.h
index 4429c46d..99831b62 100644
--- a/adaptors/kbslideradaptor/kbslideradaptorplugin.h
+++ b/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);
 };
diff --git a/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdev.pro.user b/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdev.pro.user
deleted file mode 100644
index ff99e82e..00000000
--- a/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdev.pro.user
+++ /dev/null
@@ -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>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
-   </valuemap>
-   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">true</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
-    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">false</value>
-    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">2</value>
-    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
-    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">2</value>
-    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
-    <value type="bool" key="Analyzer.Valgrind.ShowReachable">true</value>
-    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
-    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
-     <value type="int">11</value>
-     <value type="int">14</value>
-     <value type="int">12</value>
-     <value type="int">13</value>
-     <value type="int">2</value>
-     <value type="int">3</value>
-     <value type="int">4</value>
-     <value type="int">5</value>
-     <value type="int">6</value>
-     <value type="int">7</value>
-     <value type="int">8</value>
-     <value type="int">9</value>
-     <value type="int">10</value>
-     <value type="int">0</value>
-     <value type="int">1</value>
-    </valuelist>
-    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
-    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value>
-    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value>
-    <value type="bool" key="ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal">false</value>
-    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">%{buildDir}</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Custom Executable</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
-    <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
-    <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
-    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
-    <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-   </valuemap>
-   <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.TargetCount</variable>
-  <value type="int">1</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
-  <value type="int">18</value>
- </data>
- <data>
-  <variable>Version</variable>
-  <value type="int">18</value>
- </data>
-</qtcreator>
diff --git a/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdevplugin.cpp b/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdevplugin.cpp
index fef96c4a..bb973aa2 100644
--- a/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdevplugin.cpp
+++ b/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdevplugin.cpp
@@ -34,7 +34,3 @@ void LidsensorAdaptorEvdevPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<LidSensorAdaptorEvdev>("lidsensoradaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(lidsensoradaptor-evdev, LidsensorAdaptorEvdevPlugin)
-#endif
diff --git a/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdevplugin.h b/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdevplugin.h
index 44fdcaa2..6c88e41d 100644
--- a/adaptors/lidsensoradaptor-evdev/lidsensoradaptor-evdevplugin.h
+++ b/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);
 };
diff --git a/adaptors/magnetometeradaptor-ascii/magnetometeradaptor-asciiplugin.cpp b/adaptors/magnetometeradaptor-ascii/magnetometeradaptor-asciiplugin.cpp
index 7ee22d2a..e03cc854 100644
--- a/adaptors/magnetometeradaptor-ascii/magnetometeradaptor-asciiplugin.cpp
+++ b/adaptors/magnetometeradaptor-ascii/magnetometeradaptor-asciiplugin.cpp
@@ -38,7 +38,3 @@ void MagnetometerAdaptorAsciiPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<MagnetometerAdaptorAscii>("magnetometeradaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magnetometeradaptor, MagnetometerAdaptorAsciiPlugin)
-#endif
diff --git a/adaptors/magnetometeradaptor-evdev/magnetometeradaptor-evdevplugin.cpp b/adaptors/magnetometeradaptor-evdev/magnetometeradaptor-evdevplugin.cpp
index 296e3403..5ef4bba1 100644
--- a/adaptors/magnetometeradaptor-evdev/magnetometeradaptor-evdevplugin.cpp
+++ b/adaptors/magnetometeradaptor-evdev/magnetometeradaptor-evdevplugin.cpp
@@ -37,7 +37,3 @@ void MagnetometerAdaptorEvdevPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<MagAdaptorEvdev>("magnetometeradaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magnetometeradaptor-evdev, MagnetometerAdaptorEvdevPlugin)
-#endif
diff --git a/adaptors/magnetometeradaptor-evdev/magnetometeradaptor-evdevplugin.h b/adaptors/magnetometeradaptor-evdev/magnetometeradaptor-evdevplugin.h
index ecb9b897..92d385fa 100644
--- a/adaptors/magnetometeradaptor-evdev/magnetometeradaptor-evdevplugin.h
+++ b/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);
diff --git a/adaptors/magnetometeradaptor-ncdk/magnetometeradaptorplugin-ncdk.cpp b/adaptors/magnetometeradaptor-ncdk/magnetometeradaptorplugin-ncdk.cpp
index 88faa375..81356bb7 100644
--- a/adaptors/magnetometeradaptor-ncdk/magnetometeradaptorplugin-ncdk.cpp
+++ b/adaptors/magnetometeradaptor-ncdk/magnetometeradaptorplugin-ncdk.cpp
@@ -33,7 +33,3 @@ void MagnetometerAdaptorPluginNCDK::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<MagnetometerAdaptorNCDK>("magnetometeradaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magnetometeradaptor, MagnetometerAdaptorPluginNCDK)
-#endif
diff --git a/adaptors/magnetometeradaptor/magnetometeradaptorplugin.cpp b/adaptors/magnetometeradaptor/magnetometeradaptorplugin.cpp
index 5544abfa..d63afa42 100644
--- a/adaptors/magnetometeradaptor/magnetometeradaptorplugin.cpp
+++ b/adaptors/magnetometeradaptor/magnetometeradaptorplugin.cpp
@@ -34,7 +34,3 @@ void MagnetometerAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<MagnetometerAdaptor>("magnetometeradaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magnetometeradaptor, MagnetometerAdaptorPlugin)
-#endif
diff --git a/adaptors/magnetometeradaptor/magnetometeradaptorplugin.h b/adaptors/magnetometeradaptor/magnetometeradaptorplugin.h
index c18695ee..58e26b43 100644
--- a/adaptors/magnetometeradaptor/magnetometeradaptorplugin.h
+++ b/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);
 };
diff --git a/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptorplugin.cpp b/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptorplugin.cpp
index 28f00710..e17fe9bc 100644
--- a/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptorplugin.cpp
+++ b/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptorplugin.cpp
@@ -29,7 +29,3 @@ void Mpu6050AccelerometerAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<Mpu6050AccelAdaptor>("accelerometeradaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(mpu6050accelerometeradaptor, Mpu6050AccelerometerAdaptorPlugin)
-#endif
diff --git a/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptorplugin.h b/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptorplugin.h
index aaed19a7..1ed759d0 100644
--- a/adaptors/mpu6050accelerometer/mpu6050accelerometeradaptorplugin.h
+++ b/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);
diff --git a/adaptors/mrstaccelerometer/mrstaccelerometeradaptorplugin.cpp b/adaptors/mrstaccelerometer/mrstaccelerometeradaptorplugin.cpp
index 1820564e..621a59e1 100644
--- a/adaptors/mrstaccelerometer/mrstaccelerometeradaptorplugin.cpp
+++ b/adaptors/mrstaccelerometer/mrstaccelerometeradaptorplugin.cpp
@@ -33,7 +33,3 @@ void MRSTAccelerometerAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<MRSTAccelAdaptor>("accelerometeradaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(accelerometeradaptor-mrst, MRSTAccelerometerAdaptorPlugin)
-#endif
diff --git a/adaptors/mrstaccelerometer/mrstaccelerometeradaptorplugin.h b/adaptors/mrstaccelerometer/mrstaccelerometeradaptorplugin.h
index e1e02a21..058ca99c 100644
--- a/adaptors/mrstaccelerometer/mrstaccelerometeradaptorplugin.h
+++ b/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);
 };
diff --git a/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptorplugin.cpp b/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptorplugin.cpp
index f2c3a750..0b1156d5 100644
--- a/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptorplugin.cpp
+++ b/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptorplugin.cpp
@@ -9,7 +9,3 @@ void OaktrailAccelerometerAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<OaktrailAccelAdaptor>("accelerometeradaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(oaktrailaccelerometeradaptor, OaktrailAccelerometerAdaptorPlugin)
-#endif
diff --git a/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptorplugin.h b/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptorplugin.h
index 29181bb0..662630bf 100644
--- a/adaptors/oaktrailaccelerometer/oaktrailaccelerometeradaptorplugin.h
+++ b/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);
 };
diff --git a/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptorplugin.cpp b/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptorplugin.cpp
index 9784e1f8..b1e8bb71 100644
--- a/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptorplugin.cpp
+++ b/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptorplugin.cpp
@@ -9,7 +9,3 @@ void OemtabletAccelerometerAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<OemtabletAccelAdaptor>("accelerometeradaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(oemtabletaccelerometeradaptor, OemtabletAccelerometerAdaptorPlugin)
-#endif
diff --git a/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptorplugin.h b/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptorplugin.h
index 07b9837f..2ecc7970 100644
--- a/adaptors/oemtabletaccelerometer/oemtabletaccelerometeradaptorplugin.h
+++ b/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);
diff --git a/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-asciiplugin.cpp b/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-asciiplugin.cpp
index 485bc3fe..a7e3a9db 100644
--- a/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-asciiplugin.cpp
+++ b/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-asciiplugin.cpp
@@ -8,7 +8,3 @@ void OEMTabletALSAdaptorAsciiPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<OEMTabletALSAdaptorAscii>("alsadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alsadaptor, OEMTabletALSAdaptorAsciiPlugin)
-#endif
diff --git a/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-asciiplugin.h b/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-asciiplugin.h
index 24ac23ed..11752e38 100644
--- a/adaptors/oemtabletalsadaptor-ascii/oemtabletalsadaptor-asciiplugin.h
+++ b/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);
 };
diff --git a/adaptors/oemtabletgyroscopeadaptor/oemtabletgyroscopeadaptorplugin.cpp b/adaptors/oemtabletgyroscopeadaptor/oemtabletgyroscopeadaptorplugin.cpp
index 9a98fe30..db52899a 100644
--- a/adaptors/oemtabletgyroscopeadaptor/oemtabletgyroscopeadaptorplugin.cpp
+++ b/adaptors/oemtabletgyroscopeadaptor/oemtabletgyroscopeadaptorplugin.cpp
@@ -8,5 +8,3 @@ void OEMTabletGyroscopeAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<OEMTabletGyroscopeAdaptor>("gyroscopeadaptor");
 }
-
-Q_EXPORT_PLUGIN2(gyroscopeadaptor, OEMTabletGyroscopeAdaptorPlugin)
diff --git a/adaptors/oemtabletgyroscopeadaptor/oemtabletgyroscopeadaptorplugin.h b/adaptors/oemtabletgyroscopeadaptor/oemtabletgyroscopeadaptorplugin.h
index 5c66087c..2f5adc43 100644
--- a/adaptors/oemtabletgyroscopeadaptor/oemtabletgyroscopeadaptorplugin.h
+++ b/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);
 };
diff --git a/adaptors/oemtabletmagnetometeradaptor/oemtabletmagnetometeradaptorplugin.cpp b/adaptors/oemtabletmagnetometeradaptor/oemtabletmagnetometeradaptorplugin.cpp
index 7cccef72..cba625bc 100644
--- a/adaptors/oemtabletmagnetometeradaptor/oemtabletmagnetometeradaptorplugin.cpp
+++ b/adaptors/oemtabletmagnetometeradaptor/oemtabletmagnetometeradaptorplugin.cpp
@@ -8,5 +8,3 @@ void OemtabletMagnetometerAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<OemtabletMagnetometerAdaptor>("magnetometeradaptor");
 }
-
-Q_EXPORT_PLUGIN2(magnetometeradaptor, OemtabletMagnetometerAdaptorPlugin)
diff --git a/adaptors/oemtabletmagnetometeradaptor/oemtabletmagnetometeradaptorplugin.h b/adaptors/oemtabletmagnetometeradaptor/oemtabletmagnetometeradaptorplugin.h
index 6573cd88..eafbd548 100644
--- a/adaptors/oemtabletmagnetometeradaptor/oemtabletmagnetometeradaptorplugin.h
+++ b/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);
 };
diff --git a/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptorplugin.cpp b/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptorplugin.cpp
index 17d82420..14dbed1c 100644
--- a/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptorplugin.cpp
+++ b/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptorplugin.cpp
@@ -9,7 +9,3 @@ void PegatronAccelerometerAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<PegatronAccelerometerAdaptor>("accelerometeradaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(pegatronaccelerometeradaptor, PegatronAccelerometerAdaptorPlugin)
-#endif
diff --git a/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptorplugin.h b/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptorplugin.h
index ceec2ac9..27681ca1 100644
--- a/adaptors/pegatronaccelerometeradaptor/pegatronaccelerometeradaptorplugin.h
+++ b/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);
 };
diff --git a/adaptors/pressureadaptor/pressureadaptorplugin.cpp b/adaptors/pressureadaptor/pressureadaptorplugin.cpp
index 38d1bbf0..4c039f7d 100644
--- a/adaptors/pressureadaptor/pressureadaptorplugin.cpp
+++ b/adaptors/pressureadaptor/pressureadaptorplugin.cpp
@@ -37,7 +37,3 @@ void PressureAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<PressureAdaptor>("pressureadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(pressureadaptor, PressureAdaptorPlugin)
-#endif
diff --git a/adaptors/pressureadaptor/pressureadaptorplugin.h b/adaptors/pressureadaptor/pressureadaptorplugin.h
index ecb123d9..88e8ffce 100644
--- a/adaptors/pressureadaptor/pressureadaptorplugin.h
+++ b/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);
diff --git a/adaptors/proximityadaptor-ascii/proximityadaptor-asciiplugin.cpp b/adaptors/proximityadaptor-ascii/proximityadaptor-asciiplugin.cpp
index ec29b9b7..697121d2 100644
--- a/adaptors/proximityadaptor-ascii/proximityadaptor-asciiplugin.cpp
+++ b/adaptors/proximityadaptor-ascii/proximityadaptor-asciiplugin.cpp
@@ -38,7 +38,3 @@ void ProximityAdaptorAsciiPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<ProximityAdaptorAscii>("proximityadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(proximityadaptor, ProximityAdaptorAsciiPlugin)
-#endif
diff --git a/adaptors/proximityadaptor-ascii/proximityadaptor-asciiplugin.h b/adaptors/proximityadaptor-ascii/proximityadaptor-asciiplugin.h
index 9f074c89..6a27be3a 100644
--- a/adaptors/proximityadaptor-ascii/proximityadaptor-asciiplugin.h
+++ b/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);
 };
diff --git a/adaptors/proximityadaptor-evdev/proximityadaptor-evdevplugin.cpp b/adaptors/proximityadaptor-evdev/proximityadaptor-evdevplugin.cpp
index 26591ef5..43c2535b 100644
--- a/adaptors/proximityadaptor-evdev/proximityadaptor-evdevplugin.cpp
+++ b/adaptors/proximityadaptor-evdev/proximityadaptor-evdevplugin.cpp
@@ -35,7 +35,3 @@ void ProximityAdaptorEvdevPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<ProximityAdaptorEvdev>("proximityadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(proximityadaptor-evdev, ProximityAdaptorEvdevPlugin)
-#endif
diff --git a/adaptors/proximityadaptor-evdev/proximityadaptor-evdevplugin.h b/adaptors/proximityadaptor-evdev/proximityadaptor-evdevplugin.h
index 1c2cb0f6..60c3ba4b 100644
--- a/adaptors/proximityadaptor-evdev/proximityadaptor-evdevplugin.h
+++ b/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);
 };
diff --git a/adaptors/proximityadaptor/proximityadaptorplugin.cpp b/adaptors/proximityadaptor/proximityadaptorplugin.cpp
index a15e4173..88d73fa2 100644
--- a/adaptors/proximityadaptor/proximityadaptorplugin.cpp
+++ b/adaptors/proximityadaptor/proximityadaptorplugin.cpp
@@ -35,7 +35,3 @@ void ProximityAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<ProximityAdaptor>("proximityadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(proximityadaptor, ProximityAdaptorPlugin)
-#endif
diff --git a/adaptors/proximityadaptor/proximityadaptorplugin.h b/adaptors/proximityadaptor/proximityadaptorplugin.h
index 69f7c2cd..dce4204f 100644
--- a/adaptors/proximityadaptor/proximityadaptorplugin.h
+++ b/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);
 };
diff --git a/adaptors/steaccelerometeradaptor/steaccelerometeradaptorplugin.cpp b/adaptors/steaccelerometeradaptor/steaccelerometeradaptorplugin.cpp
index fe69a046..501cc69d 100644
--- a/adaptors/steaccelerometeradaptor/steaccelerometeradaptorplugin.cpp
+++ b/adaptors/steaccelerometeradaptor/steaccelerometeradaptorplugin.cpp
@@ -9,7 +9,3 @@ void SteAccelerometerAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<SteAccelAdaptor>("accelerometeradaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(steaccelerometeradaptor,SteAccelerometerAdaptorPlugin)
-#endif
diff --git a/adaptors/steaccelerometeradaptor/steaccelerometeradaptorplugin.h b/adaptors/steaccelerometeradaptor/steaccelerometeradaptorplugin.h
index de40fcaa..808f9676 100644
--- a/adaptors/steaccelerometeradaptor/steaccelerometeradaptorplugin.h
+++ b/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);
 };
diff --git a/adaptors/tapadaptor/tapadaptorplugin.cpp b/adaptors/tapadaptor/tapadaptorplugin.cpp
index b8bac666..d6850fe6 100644
--- a/adaptors/tapadaptor/tapadaptorplugin.cpp
+++ b/adaptors/tapadaptor/tapadaptorplugin.cpp
@@ -34,7 +34,3 @@ void TapAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<TapAdaptor>("tapadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(tapadaptor, TapAdaptorPlugin)
-#endif
diff --git a/adaptors/tapadaptor/tapadaptorplugin.h b/adaptors/tapadaptor/tapadaptorplugin.h
index 24fa53d1..8fc3cf42 100644
--- a/adaptors/tapadaptor/tapadaptorplugin.h
+++ b/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);
 };
diff --git a/adaptors/temperatureadaptor/temperatureadaptorplugin.cpp b/adaptors/temperatureadaptor/temperatureadaptorplugin.cpp
index f129d684..5d5fef87 100644
--- a/adaptors/temperatureadaptor/temperatureadaptorplugin.cpp
+++ b/adaptors/temperatureadaptor/temperatureadaptorplugin.cpp
@@ -34,7 +34,3 @@ void TemperatureAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<TemperatureAdaptor>("temperatureadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(temperatureadaptor, TemperatureAdaptorPlugin)
-#endif
diff --git a/adaptors/temperatureadaptor/temperatureadaptorplugin.h b/adaptors/temperatureadaptor/temperatureadaptorplugin.h
index 03298138..aeb19c59 100644
--- a/adaptors/temperatureadaptor/temperatureadaptorplugin.h
+++ b/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);
diff --git a/adaptors/touchadaptor/touchadaptorplugin.cpp b/adaptors/touchadaptor/touchadaptorplugin.cpp
index 916b9714..a9a301c7 100644
--- a/adaptors/touchadaptor/touchadaptorplugin.cpp
+++ b/adaptors/touchadaptor/touchadaptorplugin.cpp
@@ -34,7 +34,3 @@ void TouchAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<TouchAdaptor>("touchadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(touchadaptor, TouchAdaptorPlugin)
-#endif
diff --git a/adaptors/touchadaptor/touchadaptorplugin.h b/adaptors/touchadaptor/touchadaptorplugin.h
index b7467cdd..7a0c909d 100644
--- a/adaptors/touchadaptor/touchadaptorplugin.h
+++ b/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);
 };
diff --git a/chains/accelerometerchain/accelerometerchainplugin.cpp b/chains/accelerometerchain/accelerometerchainplugin.cpp
index f63028b7..c3902b74 100644
--- a/chains/accelerometerchain/accelerometerchainplugin.cpp
+++ b/chains/accelerometerchain/accelerometerchainplugin.cpp
@@ -39,7 +39,3 @@ void AccelerometerChainPlugin::Register(class Loader&)
 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
diff --git a/chains/accelerometerchain/accelerometerchainplugin.h b/chains/accelerometerchain/accelerometerchainplugin.h
index 684c80d9..884a6958 100644
--- a/chains/accelerometerchain/accelerometerchainplugin.h
+++ b/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);
diff --git a/chains/compasschain/compasschainplugin.cpp b/chains/compasschain/compasschainplugin.cpp
index 3e86246c..50fe03e2 100644
--- a/chains/compasschain/compasschainplugin.cpp
+++ b/chains/compasschain/compasschainplugin.cpp
@@ -44,7 +44,3 @@ QStringList CompassChainPlugin::Dependencies() {
         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
diff --git a/chains/compasschain/compasschainplugin.h b/chains/compasschain/compasschainplugin.h
index f606ade4..ea29cf04 100644
--- a/chains/compasschain/compasschainplugin.h
+++ b/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);
diff --git a/chains/magcalibrationchain/magcalibrationchainplugin.cpp b/chains/magcalibrationchain/magcalibrationchainplugin.cpp
index 0c2aea80..5e672a9b 100644
--- a/chains/magcalibrationchain/magcalibrationchainplugin.cpp
+++ b/chains/magcalibrationchain/magcalibrationchainplugin.cpp
@@ -35,7 +35,3 @@ void MagCalibrationChainPlugin::Register(class Loader&)
 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
diff --git a/chains/magcalibrationchain/magcalibrationchainplugin.h b/chains/magcalibrationchain/magcalibrationchainplugin.h
index b32f3ce0..7a4a9c1c 100644
--- a/chains/magcalibrationchain/magcalibrationchainplugin.h
+++ b/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);
diff --git a/chains/orientationchain/orientationchainplugin.cpp b/chains/orientationchain/orientationchainplugin.cpp
index 1eb40f79..84d452d9 100644
--- a/chains/orientationchain/orientationchainplugin.cpp
+++ b/chains/orientationchain/orientationchainplugin.cpp
@@ -39,7 +39,3 @@ void OrientationChainPlugin::Register(class Loader&)
 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
diff --git a/chains/orientationchain/orientationchainplugin.h b/chains/orientationchain/orientationchainplugin.h
index 4b0fa573..cffcd72f 100644
--- a/chains/orientationchain/orientationchainplugin.h
+++ b/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();
diff --git a/common-config.pri b/common-config.pri
index 4275bddb..2ef4a59c 100644
--- a/common-config.pri
+++ b/common-config.pri
@@ -29,9 +29,7 @@ profile-libc {
   QMAKE_LFLAGS += -lc_p
 }
 
-equals(QT_MAJOR_VERSION, 5):{
-    TARGET = $$TARGET-qt5
-}
+TARGET = $$TARGET-qt5
 
 OTHER_FILES += \
     ../../common.pri
diff --git a/common-install.pri b/common-install.pri
index 03fedb09..9b57e341 100644
--- a/common-install.pri
+++ b/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
diff --git a/common.pri b/common.pri
index e9fd6979..c0dfebf3 100644
--- a/common.pri
+++ b/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
diff --git a/core/core.pro b/core/core.pro
index b5b7eca6..2d268a84 100644
--- a/core/core.pro
+++ b/core/core.pro
@@ -15,14 +15,8 @@ SENSORFW_INCLUDEPATHS = .. \
 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 \
diff --git a/examples/adaptorplugin/sampleadaptorplugin.cpp b/examples/adaptorplugin/sampleadaptorplugin.cpp
index 6a4a39da..60860318 100644
--- a/examples/adaptorplugin/sampleadaptorplugin.cpp
+++ b/examples/adaptorplugin/sampleadaptorplugin.cpp
@@ -37,8 +37,3 @@ void SampleAdaptorPlugin::Register(class Loader&)
     // "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
diff --git a/examples/adaptorplugin/sampleadaptorplugin.h b/examples/adaptorplugin/sampleadaptorplugin.h
index 7cda279a..c637a8a2 100644
--- a/examples/adaptorplugin/sampleadaptorplugin.h
+++ b/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);
 };
diff --git a/examples/chainplugin/samplechainplugin.cpp b/examples/chainplugin/samplechainplugin.cpp
index 68cab39d..1e4508f9 100644
--- a/examples/chainplugin/samplechainplugin.cpp
+++ b/examples/chainplugin/samplechainplugin.cpp
@@ -43,7 +43,3 @@ void SampleChainPlugin::Register(class Loader&)
 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
diff --git a/examples/chainplugin/samplechainplugin.h b/examples/chainplugin/samplechainplugin.h
index ff9d971b..9b6f1631 100644
--- a/examples/chainplugin/samplechainplugin.h
+++ b/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();
diff --git a/examples/filterplugin/samplefilterplugin.cpp b/examples/filterplugin/samplefilterplugin.cpp
index 0aaa0095..ea3cb79e 100644
--- a/examples/filterplugin/samplefilterplugin.cpp
+++ b/examples/filterplugin/samplefilterplugin.cpp
@@ -34,7 +34,3 @@ void SampleFilterPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerFilter<SampleFilter>("samplefilter");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(samplefilter, SampleFilterPlugin)
-#endif
diff --git a/examples/filterplugin/samplefilterplugin.h b/examples/filterplugin/samplefilterplugin.h
index 3e9846e5..7fad3d1e 100644
--- a/examples/filterplugin/samplefilterplugin.h
+++ b/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);
 };
diff --git a/examples/sensorplugin/sampleplugin.cpp b/examples/sensorplugin/sampleplugin.cpp
index 512ec697..ec326cee 100644
--- a/examples/sensorplugin/sampleplugin.cpp
+++ b/examples/sensorplugin/sampleplugin.cpp
@@ -42,7 +42,3 @@ void SamplePlugin::Register(class Loader&)
 QStringList SamplePlugin::Dependencies() {
     return QString("samplechain").split(":", QString::SkipEmptyParts);
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(samplesensor, SamplePlugin)
-#endif
diff --git a/examples/sensorplugin/sampleplugin.h b/examples/sensorplugin/sampleplugin.h
index fa00661d..c46fc990 100644
--- a/examples/sensorplugin/sampleplugin.h
+++ b/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();
diff --git a/filters/avgaccfilter/avgaccfilterplugin.cpp b/filters/avgaccfilter/avgaccfilterplugin.cpp
index a8380181..0eed49e1 100644
--- a/filters/avgaccfilter/avgaccfilterplugin.cpp
+++ b/filters/avgaccfilter/avgaccfilterplugin.cpp
@@ -30,7 +30,3 @@ void AvgAccFilterPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerFilter<AvgAccFilter>("avgaccfilter");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(avgaccfilter, AvgAccFilterPlugin)
-#endif
diff --git a/filters/avgaccfilter/avgaccfilterplugin.h b/filters/avgaccfilter/avgaccfilterplugin.h
index db2661c7..1808bca3 100644
--- a/filters/avgaccfilter/avgaccfilterplugin.h
+++ b/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);
 };
diff --git a/filters/coordinatealignfilter/coordinatealignfilterplugin.cpp b/filters/coordinatealignfilter/coordinatealignfilterplugin.cpp
index 250021e9..4d000f34 100644
--- a/filters/coordinatealignfilter/coordinatealignfilterplugin.cpp
+++ b/filters/coordinatealignfilter/coordinatealignfilterplugin.cpp
@@ -34,7 +34,3 @@ void CoordinateAlignFilterPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerFilter<CoordinateAlignFilter>("coordinatealignfilter");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(coordinatealignfilter, CoordinateAlignFilterPlugin)
-#endif
diff --git a/filters/coordinatealignfilter/coordinatealignfilterplugin.h b/filters/coordinatealignfilter/coordinatealignfilterplugin.h
index 8e240382..52d3a00f 100644
--- a/filters/coordinatealignfilter/coordinatealignfilterplugin.h
+++ b/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);
 };
diff --git a/filters/declinationfilter/declinationfilter.cpp b/filters/declinationfilter/declinationfilter.cpp
index bcb8ccd5..4903f649 100644
--- a/filters/declinationfilter/declinationfilter.cpp
+++ b/filters/declinationfilter/declinationfilter.cpp
@@ -51,13 +51,8 @@ void DeclinationFilter::correct(unsigned, const CompassData* data)
     }
 
     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 @@ void DeclinationFilter::loadSettings()
     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
 }
diff --git a/filters/declinationfilter/declinationfilterplugin.cpp b/filters/declinationfilter/declinationfilterplugin.cpp
index cd792336..2abac611 100644
--- a/filters/declinationfilter/declinationfilterplugin.cpp
+++ b/filters/declinationfilter/declinationfilterplugin.cpp
@@ -34,7 +34,3 @@ void DeclinationFilterPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerFilter<DeclinationFilter>("declinationfilter");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(declinationfilter, DeclinationFilterPlugin)
-#endif
diff --git a/filters/declinationfilter/declinationfilterplugin.h b/filters/declinationfilter/declinationfilterplugin.h
index 2570864a..96b3cb77 100644
--- a/filters/declinationfilter/declinationfilterplugin.h
+++ b/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);
 };
diff --git a/filters/downsamplefilter/downsamplefilterplugin.cpp b/filters/downsamplefilter/downsamplefilterplugin.cpp
index 9f1dcceb..c5d8d759 100644
--- a/filters/downsamplefilter/downsamplefilterplugin.cpp
+++ b/filters/downsamplefilter/downsamplefilterplugin.cpp
@@ -34,7 +34,3 @@ void DownsampleFilterPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerFilter<DownsampleFilter>("downsamplefilter");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(downsamplefilter, DownsampleFilterPlugin)
-#endif
diff --git a/filters/downsamplefilter/downsamplefilterplugin.h b/filters/downsamplefilter/downsamplefilterplugin.h
index d3a654ca..3c2a4097 100644
--- a/filters/downsamplefilter/downsamplefilterplugin.h
+++ b/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);
 };
diff --git a/filters/magcoordinatealignfilter/magcoordinatealignfilterplugin.cpp b/filters/magcoordinatealignfilter/magcoordinatealignfilterplugin.cpp
index d872af0e..4f2db7b1 100644
--- a/filters/magcoordinatealignfilter/magcoordinatealignfilterplugin.cpp
+++ b/filters/magcoordinatealignfilter/magcoordinatealignfilterplugin.cpp
@@ -34,7 +34,3 @@ void MagCoordinateAlignFilterPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerFilter<MagCoordinateAlignFilter>("magcoordinatealignfilter");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magcoordinatealignfilter, MagCoordinateAlignFilterPlugin)
-#endif
diff --git a/filters/magcoordinatealignfilter/magcoordinatealignfilterplugin.h b/filters/magcoordinatealignfilter/magcoordinatealignfilterplugin.h
index 74dca905..dce51619 100644
--- a/filters/magcoordinatealignfilter/magcoordinatealignfilterplugin.h
+++ b/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);
 };
diff --git a/filters/orientationinterpreter/orientationinterpreterplugin.cpp b/filters/orientationinterpreter/orientationinterpreterplugin.cpp
index b27100ee..bfc616fd 100644
--- a/filters/orientationinterpreter/orientationinterpreterplugin.cpp
+++ b/filters/orientationinterpreter/orientationinterpreterplugin.cpp
@@ -35,7 +35,3 @@ void OrientationInterpreterPlugin::Register(class Loader&)
     sensordLogD() << "registering orientationinterpreter";
     sm.registerFilter<OrientationInterpreter>("orientationinterpreter");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(orientationinterpreter, OrientationInterpreterPlugin)
-#endif
diff --git a/filters/orientationinterpreter/orientationinterpreterplugin.h b/filters/orientationinterpreter/orientationinterpreterplugin.h
index 45150842..0c6a677b 100644
--- a/filters/orientationinterpreter/orientationinterpreterplugin.h
+++ b/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);
 };
diff --git a/filters/rotationfilter/rotationfilterplugin.cpp b/filters/rotationfilter/rotationfilterplugin.cpp
index a69c4b67..e22bede5 100644
--- a/filters/rotationfilter/rotationfilterplugin.cpp
+++ b/filters/rotationfilter/rotationfilterplugin.cpp
@@ -35,7 +35,3 @@ void RotationFilterPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerFilter<RotationFilter>("rotationfilter");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(rotationfilter, RotationFilterPlugin)
-#endif
diff --git a/filters/rotationfilter/rotationfilterplugin.h b/filters/rotationfilter/rotationfilterplugin.h
index a21baad1..38e2b957 100644
--- a/filters/rotationfilter/rotationfilterplugin.h
+++ b/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);
 };
diff --git a/qt-api/abstractsensor_i.cpp b/qt-api/abstractsensor_i.cpp
index 818bea3b..c2a1deca 100644
--- a/qt-api/abstractsensor_i.cpp
+++ b/qt-api/abstractsensor_i.cpp
@@ -39,11 +39,7 @@ struct AbstractSensorChannelInterface::AbstractSensorChannelInterfaceImpl : publ
 {
     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 @@ QDBusMessage AbstractSensorChannelInterface::callWithArgumentList(QDBus::CallMod
     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);
 }
diff --git a/qt-api/abstractsensor_i.h b/qt-api/abstractsensor_i.h
index 17d8b4b6..4a02248a 100644
--- a/qt-api/abstractsensor_i.h
+++ b/qt-api/abstractsensor_i.h
@@ -466,11 +466,7 @@ private Q_SLOTS: // METHODS
      * 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);
diff --git a/qt-api/accelerometersensor_i.cpp b/qt-api/accelerometersensor_i.cpp
index 0d4ddd9a..23f279f4 100644
--- a/qt-api/accelerometersensor_i.cpp
+++ b/qt-api/accelerometersensor_i.cpp
@@ -86,18 +86,10 @@ XYZ AccelerometerSensorChannelInterface::get()
     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);
 }
diff --git a/qt-api/accelerometersensor_i.h b/qt-api/accelerometersensor_i.h
index d9028f8d..a9e983ee 100644
--- a/qt-api/accelerometersensor_i.h
+++ b/qt-api/accelerometersensor_i.h
@@ -99,12 +99,8 @@ class AccelerometerSensorChannelInterface : public AbstractSensorChannelInterfac
 
 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. */
diff --git a/qt-api/gyroscopesensor_i.cpp b/qt-api/gyroscopesensor_i.cpp
index 9ff7af35..29d088a4 100644
--- a/qt-api/gyroscopesensor_i.cpp
+++ b/qt-api/gyroscopesensor_i.cpp
@@ -86,18 +86,10 @@ bool GyroscopeSensorChannelInterface::dataReceivedImpl()
     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);
 }
diff --git a/qt-api/gyroscopesensor_i.h b/qt-api/gyroscopesensor_i.h
index 52215c53..495b674f 100644
--- a/qt-api/gyroscopesensor_i.h
+++ b/qt-api/gyroscopesensor_i.h
@@ -99,11 +99,7 @@ class GyroscopeSensorChannelInterface : public AbstractSensorChannelInterface
     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:
diff --git a/qt-api/magnetometersensor_i.cpp b/qt-api/magnetometersensor_i.cpp
index 87048fc7..c6516828 100644
--- a/qt-api/magnetometersensor_i.cpp
+++ b/qt-api/magnetometersensor_i.cpp
@@ -83,18 +83,10 @@ bool MagnetometerSensorChannelInterface::dataReceivedImpl()
     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);
 }
diff --git a/qt-api/magnetometersensor_i.h b/qt-api/magnetometersensor_i.h
index 19c428fa..238e901a 100644
--- a/qt-api/magnetometersensor_i.h
+++ b/qt-api/magnetometersensor_i.h
@@ -100,11 +100,7 @@ class MagnetometerSensorChannelInterface : public AbstractSensorChannelInterface
     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:
diff --git a/qt-api/qt-api.pro b/qt-api/qt-api.pro
index 3a3a0dda..1fa3d7db 100644
--- a/qt-api/qt-api.pro
+++ b/qt-api/qt-api.pro
@@ -50,12 +50,9 @@ SENSORFW_INCLUDEPATHS = .. \
 
 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
diff --git a/qt-api/rotationsensor_i.cpp b/qt-api/rotationsensor_i.cpp
index 5c1145c7..80746d8c 100644
--- a/qt-api/rotationsensor_i.cpp
+++ b/qt-api/rotationsensor_i.cpp
@@ -92,18 +92,10 @@ bool RotationSensorChannelInterface::hasZ()
     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);
 }
diff --git a/qt-api/rotationsensor_i.h b/qt-api/rotationsensor_i.h
index 094cbec4..0ba88df8 100644
--- a/qt-api/rotationsensor_i.h
+++ b/qt-api/rotationsensor_i.h
@@ -109,11 +109,7 @@ class RotationSensorChannelInterface: public AbstractSensorChannelInterface
     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();
 
diff --git a/qt-api/sensormanager_i.cpp b/qt-api/sensormanager_i.cpp
index 3132f072..0f27accf 100644
--- a/qt-api/sensormanager_i.cpp
+++ b/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");
diff --git a/sensord.pc b/sensord.pc
deleted file mode 100644
index e6fe5830..00000000
--- a/sensord.pc
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=/usr
-includedir=${prefix}/include/sensord
-libdir=${prefix}/lib/
-
-Name: Sensorfw
-Description: Sensorfw
-Version: 0.11.3
-Requires:
-Libs: -L${libdir} -lsensorclient -lsensordatatypes
-Cflags: -I${includedir} -I${includedir}/datatypes -I${includedir}/filters
diff --git a/sensord.prf b/sensord.prf
index bb3285e8..c3bd7ed9 100644
--- a/sensord.prf
+++ b/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
 
diff --git a/sensord/main.cpp b/sensord/main.cpp
index 4e01bc48..6d13cbc9 100644
--- a/sensord/main.cpp
+++ b/sensord/main.cpp
@@ -169,7 +169,6 @@ void SignalNotifier::handleSignalInput(int socket)
 {
     Q_UNUSED(socket);
     int sig = SIGTERM;
-    uint64_t tmp = 0;
     if (read(s_pipe[0], &sig, sizeof sig) == -1) {
         // dontcare
     }
diff --git a/sensord/sensord.pro b/sensord/sensord.pro
index c1257030..3fd453d7 100644
--- a/sensord/sensord.pro
+++ b/sensord/sensord.pro
@@ -23,12 +23,7 @@ INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
 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 \
diff --git a/sensorfw.pro b/sensorfw.pro
index afc6997c..92b80f61 100644
--- a/sensorfw.pro
+++ b/sensorfw.pro
@@ -26,10 +26,6 @@ SUBDIRS = datatypes \
           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 @@ contains(CONFIG,hybris) {
     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/" $$_PRO_FILE_PWD_/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/" $$_PRO_FILE_PWD_/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/*
diff --git a/sensors/accelerometersensor/accelerometerplugin.cpp b/sensors/accelerometersensor/accelerometerplugin.cpp
index 0fe896a2..70029fb2 100644
--- a/sensors/accelerometersensor/accelerometerplugin.cpp
+++ b/sensors/accelerometersensor/accelerometerplugin.cpp
@@ -39,7 +39,3 @@ void AccelerometerPlugin::Register(class Loader&)
 QStringList AccelerometerPlugin::Dependencies() {
     return QString("accelerometerchain").split(":", QString::SkipEmptyParts);
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(accelerometersensor, AccelerometerPlugin)
-#endif
diff --git a/sensors/accelerometersensor/accelerometerplugin.h b/sensors/accelerometersensor/accelerometerplugin.h
index 781ac7ea..674094db 100644
--- a/sensors/accelerometersensor/accelerometerplugin.h
+++ b/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);
diff --git a/sensors/alssensor/alsplugin.cpp b/sensors/alssensor/alsplugin.cpp
index b51a0b7a..23b56378 100644
--- a/sensors/alssensor/alsplugin.cpp
+++ b/sensors/alssensor/alsplugin.cpp
@@ -45,7 +45,3 @@ void ALSPlugin::Init(class Loader& l)
 QStringList ALSPlugin::Dependencies() {
     return QString("alsadaptor").split(":", QString::SkipEmptyParts);
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alssensor, ALSPlugin)
-#endif
diff --git a/sensors/alssensor/alsplugin.h b/sensors/alssensor/alsplugin.h
index 61aa6baf..b05b8213 100644
--- a/sensors/alssensor/alsplugin.h
+++ b/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);
diff --git a/sensors/compasssensor/compassplugin.cpp b/sensors/compasssensor/compassplugin.cpp
index 16cee06e..c9b088d7 100644
--- a/sensors/compasssensor/compassplugin.cpp
+++ b/sensors/compasssensor/compassplugin.cpp
@@ -39,7 +39,3 @@ void CompassPlugin::Register(class Loader&)
 QStringList CompassPlugin::Dependencies() {
     return QString("compasschain").split(":", QString::SkipEmptyParts);
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(compasssensor, CompassPlugin)
-#endif
diff --git a/sensors/compasssensor/compassplugin.h b/sensors/compasssensor/compassplugin.h
index 66106f62..b3bae540 100644
--- a/sensors/compasssensor/compassplugin.h
+++ b/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();
diff --git a/sensors/contextplugin/contextplugin.cpp b/sensors/contextplugin/contextplugin.cpp
index d0b1bc6f..9c52d64c 100644
--- a/sensors/contextplugin/contextplugin.cpp
+++ b/sensors/contextplugin/contextplugin.cpp
@@ -50,7 +50,3 @@ int ContextPlugin::getSessionId()
 {
     return sessionId;
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(contextsensor, ContextPlugin)
-#endif
diff --git a/sensors/contextplugin/contextplugin.h b/sensors/contextplugin/contextplugin.h
index d7c5584f..b10cb44b 100644
--- a/sensors/contextplugin/contextplugin.h
+++ b/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();
 
diff --git a/sensors/gyroscopesensor/gyroscopeplugin.cpp b/sensors/gyroscopesensor/gyroscopeplugin.cpp
index 8b7f37fd..e28ef513 100644
--- a/sensors/gyroscopesensor/gyroscopeplugin.cpp
+++ b/sensors/gyroscopesensor/gyroscopeplugin.cpp
@@ -39,7 +39,3 @@ void GyroscopePlugin::Register(class Loader&)
 QStringList GyroscopePlugin::Dependencies() {
     return QString("gyroscopeadaptor").split(":", QString::SkipEmptyParts);
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(gyroscopesensor, GyroscopePlugin)
-#endif
diff --git a/sensors/gyroscopesensor/gyroscopeplugin.h b/sensors/gyroscopesensor/gyroscopeplugin.h
index ef3b5aea..20a764da 100644
--- a/sensors/gyroscopesensor/gyroscopeplugin.h
+++ b/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();
diff --git a/sensors/humiditysensor/humidityplugin.cpp b/sensors/humiditysensor/humidityplugin.cpp
index ad054e5a..fd0d03d7 100644
--- a/sensors/humiditysensor/humidityplugin.cpp
+++ b/sensors/humiditysensor/humidityplugin.cpp
@@ -44,7 +44,3 @@ void HumidityPlugin::Init(class Loader& l)
 QStringList HumidityPlugin::Dependencies() {
     return QString("humidityadaptor").split(":", QString::SkipEmptyParts);
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(humiditysensor, HumidityPlugin)
-#endif
diff --git a/sensors/humiditysensor/humidityplugin.h b/sensors/humiditysensor/humidityplugin.h
index 5bd21d7a..98544ce1 100644
--- a/sensors/humiditysensor/humidityplugin.h
+++ b/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);
diff --git a/sensors/lidsensor/lidplugin.cpp b/sensors/lidsensor/lidplugin.cpp
index 2a729be3..85964c83 100644
--- a/sensors/lidsensor/lidplugin.cpp
+++ b/sensors/lidsensor/lidplugin.cpp
@@ -44,7 +44,3 @@ void LidPlugin::Init(class Loader& l)
 QStringList LidPlugin::Dependencies() {
     return QString("lidsensoradaptor").split(":", QString::SkipEmptyParts);
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(lidsensor, LidPlugin)
-#endif
diff --git a/sensors/lidsensor/lidplugin.h b/sensors/lidsensor/lidplugin.h
index f1aba568..84a69b1f 100644
--- a/sensors/lidsensor/lidplugin.h
+++ b/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);
diff --git a/sensors/magnetometersensor/magnetometerplugin.cpp b/sensors/magnetometersensor/magnetometerplugin.cpp
index 1c902b1c..ee579214 100644
--- a/sensors/magnetometersensor/magnetometerplugin.cpp
+++ b/sensors/magnetometersensor/magnetometerplugin.cpp
@@ -39,7 +39,3 @@ void MagnetometerPlugin::Register(class Loader&)
 QStringList MagnetometerPlugin::Dependencies() {
     return QString("magcalibrationchain").split(":", QString::SkipEmptyParts);
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(magnetometersensor, MagnetometerPlugin)
-#endif
diff --git a/sensors/magnetometersensor/magnetometerplugin.h b/sensors/magnetometersensor/magnetometerplugin.h
index 0960b3be..a7627ee6 100644
--- a/sensors/magnetometersensor/magnetometerplugin.h
+++ b/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();
diff --git a/sensors/orientationsensor/orientationplugin.cpp b/sensors/orientationsensor/orientationplugin.cpp
index ac1d8a12..3eb32b25 100644
--- a/sensors/orientationsensor/orientationplugin.cpp
+++ b/sensors/orientationsensor/orientationplugin.cpp
@@ -39,7 +39,3 @@ void OrientationPlugin::Register(class Loader&)
 QStringList OrientationPlugin::Dependencies() {
     return QString("orientationchain").split(":", QString::SkipEmptyParts);
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(orientationsensor, OrientationPlugin)
-#endif
diff --git a/sensors/orientationsensor/orientationplugin.h b/sensors/orientationsensor/orientationplugin.h
index 9dad281c..9b56dc65 100644
--- a/sensors/orientationsensor/orientationplugin.h
+++ b/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();
diff --git a/sensors/pressuresensor/pressureplugin.cpp b/sensors/pressuresensor/pressureplugin.cpp
index f06017d3..50fe101a 100644
--- a/sensors/pressuresensor/pressureplugin.cpp
+++ b/sensors/pressuresensor/pressureplugin.cpp
@@ -44,7 +44,3 @@ void PressurePlugin::Init(class Loader& l)
 QStringList PressurePlugin::Dependencies() {
     return QString("pressureadaptor").split(":", QString::SkipEmptyParts);
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(pressuresensor, PressurePlugin)
-#endif
diff --git a/sensors/pressuresensor/pressureplugin.h b/sensors/pressuresensor/pressureplugin.h
index cd13c784..b639fec7 100644
--- a/sensors/pressuresensor/pressureplugin.h
+++ b/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);
diff --git a/sensors/proximitysensor/proximityplugin.cpp b/sensors/proximitysensor/proximityplugin.cpp
index 03fed5f9..b2f207a2 100644
--- a/sensors/proximitysensor/proximityplugin.cpp
+++ b/sensors/proximitysensor/proximityplugin.cpp
@@ -38,7 +38,3 @@ void ProximityPlugin::Register(class Loader&)
 QStringList ProximityPlugin::Dependencies() {
     return QString("proximityadaptor").split(":", QString::SkipEmptyParts);
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(proximitysensor, ProximityPlugin)
-#endif
diff --git a/sensors/proximitysensor/proximityplugin.h b/sensors/proximitysensor/proximityplugin.h
index c3582b5a..117a04ab 100644
--- a/sensors/proximitysensor/proximityplugin.h
+++ b/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();
diff --git a/sensors/rotationsensor/rotationplugin.cpp b/sensors/rotationsensor/rotationplugin.cpp
index ec1698a5..e6ece7a2 100644
--- a/sensors/rotationsensor/rotationplugin.cpp
+++ b/sensors/rotationsensor/rotationplugin.cpp
@@ -38,7 +38,3 @@ void RotationPlugin::Register(class Loader&)
 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
diff --git a/sensors/rotationsensor/rotationplugin.h b/sensors/rotationsensor/rotationplugin.h
index 352efbf4..56822db4 100644
--- a/sensors/rotationsensor/rotationplugin.h
+++ b/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();
diff --git a/sensors/stepcountersensor/stepcounterplugin.cpp b/sensors/stepcountersensor/stepcounterplugin.cpp
index 877d925b..219be93d 100644
--- a/sensors/stepcountersensor/stepcounterplugin.cpp
+++ b/sensors/stepcountersensor/stepcounterplugin.cpp
@@ -47,7 +47,3 @@ void StepCounterPlugin::Init(class Loader& l)
 QStringList StepCounterPlugin::Dependencies() {
     return QString("stepcounteradaptor").split(":", QString::SkipEmptyParts);
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(stepcountersensor, StepCounterPlugin)
-#endif
diff --git a/sensors/stepcountersensor/stepcounterplugin.h b/sensors/stepcountersensor/stepcounterplugin.h
index 0aba0623..73d5aac4 100644
--- a/sensors/stepcountersensor/stepcounterplugin.h
+++ b/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);
diff --git a/sensors/tapsensor/tapplugin.cpp b/sensors/tapsensor/tapplugin.cpp
index 5cc74f1b..de67c377 100644
--- a/sensors/tapsensor/tapplugin.cpp
+++ b/sensors/tapsensor/tapplugin.cpp
@@ -39,7 +39,3 @@ void TapPlugin::Register(class Loader&)
 QStringList TapPlugin::Dependencies() {
     return QString("tapadaptor").split(":", QString::SkipEmptyParts);
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(tapsensor, TapPlugin)
-#endif
diff --git a/sensors/tapsensor/tapplugin.h b/sensors/tapsensor/tapplugin.h
index 0f6deceb..d6e00687 100644
--- a/sensors/tapsensor/tapplugin.h
+++ b/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();
diff --git a/sensors/temperaturesensor/temperatureplugin.cpp b/sensors/temperaturesensor/temperatureplugin.cpp
index e4b854e6..49c0becc 100644
--- a/sensors/temperaturesensor/temperatureplugin.cpp
+++ b/sensors/temperaturesensor/temperatureplugin.cpp
@@ -44,7 +44,3 @@ void TemperaturePlugin::Init(class Loader& l)
 QStringList TemperaturePlugin::Dependencies() {
     return QString("temperatureadaptor").split(":", QString::SkipEmptyParts);
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(temperaturesensor, TemperaturePlugin)
-#endif
diff --git a/sensors/temperaturesensor/temperatureplugin.h b/sensors/temperaturesensor/temperatureplugin.h
index e783b39c..dc7c8e3b 100644
--- a/sensors/temperaturesensor/temperatureplugin.h
+++ b/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);
diff --git a/tests/benchmark/benchmarktest/benchmarktest.pro b/tests/benchmark/benchmarktest/benchmarktest.pro
index 56c24d74..8898f068 100644
--- a/tests/benchmark/benchmarktest/benchmarktest.pro
+++ b/tests/benchmark/benchmarktest/benchmarktest.pro
@@ -25,9 +25,4 @@ QMAKE_LIBDIR_FLAGS += -L../../../qt-api \
                       -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
diff --git a/tests/benchmark/dummyclient/dummyclient.pro b/tests/benchmark/dummyclient/dummyclient.pro
index 15c9c343..47a1c37d 100644
--- a/tests/benchmark/dummyclient/dummyclient.pro
+++ b/tests/benchmark/dummyclient/dummyclient.pro
@@ -16,9 +16,4 @@ QMAKE_LIBDIR_FLAGS += -L../../../qt-api  \
                       -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
diff --git a/tests/benchmark/fakeadaptor/fakeadaptorplugin.cpp b/tests/benchmark/fakeadaptor/fakeadaptorplugin.cpp
index f29c390b..08933e69 100644
--- a/tests/benchmark/fakeadaptor/fakeadaptorplugin.cpp
+++ b/tests/benchmark/fakeadaptor/fakeadaptorplugin.cpp
@@ -34,7 +34,3 @@ void FakeAdaptorPlugin::Register(class Loader&)
     SensorManager& sm = SensorManager::instance();
     sm.registerDeviceAdaptor<FakeAdaptor>("alsadaptor");
 }
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(alsadaptor, FakeAdaptorPlugin)
-#endif
diff --git a/tests/benchmark/fakeadaptor/fakeadaptorplugin.h b/tests/benchmark/fakeadaptor/fakeadaptorplugin.h
index 183b8932..5fbc50ef 100644
--- a/tests/benchmark/fakeadaptor/fakeadaptorplugin.h
+++ b/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);
 };
diff --git a/tests/client/client.pro b/tests/client/client.pro
index e4e4b2b8..55b01625 100644
--- a/tests/client/client.pro
+++ b/tests/client/client.pro
@@ -24,9 +24,5 @@ INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
 
 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
diff --git a/tests/common-install.pri b/tests/common-install.pri
index 15e26b8b..b51210b4 100644
--- a/tests/common-install.pri
+++ b/tests/common-install.pri
@@ -3,12 +3,8 @@ QT += testlib
 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
diff --git a/tests/deadclient/deadclient.pro b/tests/deadclient/deadclient.pro
index cddf8cfb..18db93b6 100644
--- a/tests/deadclient/deadclient.pro
+++ b/tests/deadclient/deadclient.pro
@@ -15,12 +15,8 @@ INCLUDEPATH += ../../ \
 
 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
diff --git a/tests/metadata/metadata.pro b/tests/metadata/metadata.pro
index 7eef861f..cc3890b7 100644
--- a/tests/metadata/metadata.pro
+++ b/tests/metadata/metadata.pro
@@ -22,12 +22,8 @@ INCLUDEPATH += $$SENSORFW_INCLUDEPATHS
 
 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
diff --git a/tests/powermanagement/driverpolltest/driverpolltest.pro b/tests/powermanagement/driverpolltest/driverpolltest.pro
index e08f5dbc..61d0d1c6 100644
--- a/tests/powermanagement/driverpolltest/driverpolltest.pro
+++ b/tests/powermanagement/driverpolltest/driverpolltest.pro
@@ -24,9 +24,4 @@ QMAKE_LIBDIR_FLAGS += -L../../../qt-api  \
                       -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
diff --git a/tests/powermanagement/powermanagementtests/powermanagementtests.pro b/tests/powermanagement/powermanagementtests/powermanagementtests.pro
index e13cdc82..a7f34b84 100644
--- a/tests/powermanagement/powermanagementtests/powermanagementtests.pro
+++ b/tests/powermanagement/powermanagementtests/powermanagementtests.pro
@@ -24,12 +24,7 @@ QMAKE_LIBDIR_FLAGS += -L../../../qt-api  \
                       -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
diff --git a/tests/powermanagement/standbyoverridetests/standbyoverridetests.pro b/tests/powermanagement/standbyoverridetests/standbyoverridetests.pro
index 2791725b..d95c6248 100644
--- a/tests/powermanagement/standbyoverridetests/standbyoverridetests.pro
+++ b/tests/powermanagement/standbyoverridetests/standbyoverridetests.pro
@@ -25,12 +25,7 @@ QMAKE_LIBDIR_FLAGS += -L../../../qt-api  \
                       -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
diff --git a/tests/testapp/testapp.pro b/tests/testapp/testapp.pro
index 22da580a..ee46dcac 100644
--- a/tests/testapp/testapp.pro
+++ b/tests/testapp/testapp.pro
@@ -36,13 +36,7 @@ QMAKE_LIBDIR_FLAGS += -L../../qt-api\
                       -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)