Compile fix for simulator

Change-Id: I4fa59e93808f51f5149556cf584fc29ac9636f96
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>

2 files changed, 12 insertions, 5 deletions

diff --git a/src/imports/systeminfo/systeminfo.pro b/src/imports/systeminfo/systeminfo.pro
index 28c1a323..3fd1bb0a 100644
--- a/src/imports/systeminfo/systeminfo.pro
+++ b/src/imports/systeminfo/systeminfo.pro
@@ -10,7 +10,7 @@ SOURCES += \
     qdeclarativenetworkinfo.cpp \
     qsysteminfo.cpp
 
-linux-*: !simulator: {
+linux-*: {
     HEADERS += \
         qdeclarativeinputdevicemodel_p.h
     SOURCES += \
diff --git a/src/systeminfo/systeminfo.pro b/src/systeminfo/systeminfo.pro
index ea66ee8d..6961f2d1 100644
--- a/src/systeminfo/systeminfo.pro
+++ b/src/systeminfo/systeminfo.pro
@@ -223,8 +223,8 @@ simulator {
         }
 
         qtHaveModule(dbus) {
-            config_ofono: {
             QT += dbus
+            config_ofono: {
             PRIVATE_HEADERS += linux/qofonowrapper_p.h \
                                linux/qnetworkinfo_linux_p.h
 
@@ -248,13 +248,20 @@ simulator {
             CONFIG += link_pkgconfig
             PKGCONFIG += udev
             LIBS += -ludev
-            PRIVATE_HEADERS += linux/qudevwrapper_p.h
+
+            config_evdev {
+                PKGCONFIG += libevdev
+                LIBS +=  -levdev
+            } else {
+                DEFINES += QT_NO_EVDEV
+            }
+            PRIVATE_HEADERS += linux/qudevwrapper_p.h \
+                linux/qinputinfomanagerudev_p.h
             SOURCES += linux/qudevwrapper.cpp \
-                       linux/qinputdeviceinfo_udev.cpp
+                       linux/qinputinfomanagerudev.cpp
         } else {
             DEFINES += QT_NO_UDEV
         }
-
     }
 }