--- a/camerauis/cameraxui/cxengine/cxengine.pro	Fri Apr 16 14:51:30 2010 +0300
+++ b/camerauis/cameraxui/cxengine/cxengine.pro	Mon May 03 12:22:55 2010 +0300
@@ -23,15 +23,20 @@
                inc/sensor \
                inc/api \
                src/dummyengine \
-               ../traces  \
+               traces  \
                ../extensions/inc
 
 VPATH += src
 CONFIG += dll
 MOC_DIR = tmp
 
-TARGET.CAPABILITY = ALL -TCB -DRM
-TARGET.UID3 = 0x20027016
+symbian {
+    TARGET.CAPABILITY = ALL -TCB -DRM
+    TARGET.UID3 = 0x20027016
+    # Fix for QMake translating INCLUDEPATH to SYSTEMINCLUDE
+    # and TraceCompiler needing USERINCLUDE.
+    MMP_RULES           += "USERINCLUDE traces"
+}
 
 # Libs
 LIBS += -lecam
@@ -59,6 +64,8 @@
 LIBS += -lharvesterclient
 LIBS += -lthumbnailmanagerqt
 LIBS += -lxqserviceutil
+LIBS += -loommonitor
+LIBS += -lhal
 
 symbian {
    TARGET.EPOCALLOWDLLDATA = 1 // TODO: check this out??
@@ -145,13 +152,17 @@
            cxequalitypresetssymbian.h \
            cxeharvestercontrolsymbian.h \
            cxethumbnailmanagersymbian.h \
+           cxememorymonitor.h \
+           cxememorymonitorprivate.h \
+           cxediskmonitor.h \
+           cxediskmonitorprivate.h \
            sensor/xqsensor.h \
            sensor/xqaccsensor.h \
            sensor/xqdeviceorientation.h \
            sensor/xqdeviceorientation_p.h \
            sensor/xqsensor_p.h \
            sensor/xqaccsensor_p.h \
-           ../traces/OstTraceDefinitions.h
+           traces/OstTraceDefinitions.h
 
 SOURCES += cxecameradevicecontrolsymbian.cpp \
            cxeengine.cpp \
@@ -187,6 +198,10 @@
            cxequalitypresetssymbian.cpp \
            cxeharvestercontrolsymbian.cpp \
            cxethumbnailmanagersymbian.cpp \
+           cxememorymonitor.cpp \
+           cxememorymonitorprivate.cpp \
+           cxediskmonitor.cpp \
+           cxediskmonitorprivate.cpp \
            sensor/xqsensor.cpp \
            sensor/xqaccsensor.cpp \
            sensor/xqdeviceorientation.cpp \
@@ -196,3 +211,4 @@
 
 
 
+