Merge branch 'power_save'

[situare] / src / src.pro

diff --git a/src/src.pro b/src/src.pro
index 9f5825e..577dca8 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -52,7 +52,8 @@ SOURCES += main.cpp \
     ui/zoombutton.cpp \
     ui/zoombuttonpanel.cpp \
     user/user.cpp \
-    ui/fullscreenbutton.cpp
+    ui/fullscreenbutton.cpp \
+    engine/mce.cpp
 HEADERS += common.h \
     engine/engine.h \
     facebookservice/facebookauthentication.h \
@@ -102,9 +103,11 @@ HEADERS += common.h \
     ui/zoombutton.h \
     ui/zoombuttonpanel.h \
     user/user.h \
-    ui/fullscreenbutton.h
+    ui/fullscreenbutton.h \
+    engine/mce.h
 QT += network \
     webkit
+
 DEFINES += QT_NO_DEBUG_OUTPUT
 
 simulator {
@@ -119,8 +122,10 @@ simulator {
     armel {
         DEFINES += ARMEL
         INCLUDEPATH += /usr/include/glib-2.0 /usr/lib/glib-2.0/include
-        SOURCES += network/networkhandlerprivate.cpp
-        HEADERS += network/networkhandlerprivate.h
+        SOURCES += network/networkhandlerprivate.cpp \
+                   engine/mceprivate.cpp
+        HEADERS += network/networkhandlerprivate.h \
+                   engine/mceprivate.h
         QT += dbus
         CONFIG += icd2 qdbus
         SOURCES += gps/gpspositionprivateliblocation.cpp \
@@ -132,13 +137,15 @@ simulator {
                    gps/geopositioninfo.h \
                    gps/geocoordinate.h
         CONFIG += link_pkgconfig
-        PKGCONFIG += glib-2.0 liblocation
+        PKGCONFIG += glib-2.0 liblocation mce
         LIBS += -llocation
     } else {
         SOURCES += gps/gpspositionprivatestub.cpp \
-                   network/networkhandlerprivatestub.cpp
+                   network/networkhandlerprivatestub.cpp \
+                   engine/mceprivatestub.cpp
         HEADERS += gps/gpspositionprivatestub.h \
-                   network/networkhandlerprivatestub.h
+                   network/networkhandlerprivatestub.h \
+                   engine/mceprivatestub.h
     }
 
     QT += maemo5
@@ -154,9 +161,11 @@ simulator {
     message(install headers with: apt-get install libqtm-dev)
 } else {
     SOURCES += gps/gpspositionprivatestub.cpp \
-               network/networkhandlerprivatestub.cpp
+               network/networkhandlerprivatestub.cpp \
+               engine/mceprivatestub.cpp
     HEADERS += gps/gpspositionprivatestub.h \
-               network/networkhandlerprivatestub.h
+               network/networkhandlerprivatestub.h \
+               engine/mceprivatestub.h
     message(QJson built in)
     message(Make sure you have QJson development headers installed)
     message(install headers with: sudo apt-get install libqjson-dev)