--- a/ipsservices/nmipssettings/nmipssettings.pro	Mon May 03 12:23:15 2010 +0300
+++ b/ipsservices/nmipssettings/nmipssettings.pro	Fri May 14 15:41:10 2010 +0300
@@ -23,10 +23,8 @@
 
 DEPENDPATH += .
 
-INCLUDEPATH += .
 INCLUDEPATH += ./inc
 INCLUDEPATH += ../../inc
-INCLUDEPATH += ../../emailuis/nmsettingui/inc/
 INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
 CONFIG += hb
@@ -49,7 +47,9 @@
            inc/nmipssettingsmanagerfactory.h \
            inc/nmipsextendedsettingsmanager.h \
            inc/nmipssettingscustomitem.h \
-           inc/nmipssettingslabeledcombobox.h
+           inc/nmipssettingslabeledcombobox.h \
+           inc/nmipssettingstimeeditor.h \
+           inc/nmipssettingsmultiselectionitem.h
 
 SOURCES += src/nmipssettingsplugin.cpp \
            src/nmipssettingshelper.cpp \
@@ -59,10 +59,9 @@
            src/nmipssettingsmanagerfactory.cpp \
            src/nmipsextendedsettingsmanager.cpp \
            src/nmipssettingscustomitem.cpp \
-           src/nmipssettingslabeledcombobox.cpp
-
-LIBS += -leuser
-LIBS += -llibc
+           src/nmipssettingslabeledcombobox.cpp \
+           src/nmipssettingstimeeditor.cpp \
+           src/nmipssettingsmultiselectionitem.cpp
 
 symbian: { 
     TARGET.EPOCALLOWDLLDATA = 1
@@ -74,7 +73,9 @@
     LIBS += -lxqutils
     LIBS += -lxqsettingsmanager
     LIBS += -leuser
+    LIBS += -llibc
 }
+
 symbian: plugin { # copy qtstub and manifest
 
     PLUGIN_STUB_PATH = /resource/qt/plugins/nmail/settings
@@ -93,7 +94,7 @@
 BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \
                              "rom/nmipssettings.iby                 CORE_APP_LAYER_IBY_EXPORT_PATH(nmipssettings.iby)" \
                              "rom/nmipssettingslanguage.iby         LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(nmipssettingslanguage.iby)" \
-                             "inc/ipssettingkeys.h                  |../../inc/ipssettingkeys.h" \
+                             "inc/ipssettingkeys.h                  |../inc/ipssettingkeys.h" \
                              "inc/nmipssettingitems.h               |../inc/nmipssettingitems.h" \
                              "conf/2000E53D.txt                     /epoc32/release/winscw/udeb/z/private/10202BE9/2000E53D.txt" \
                              "conf/2000E53D.txt                     /epoc32/release/winscw/urel/z/private/10202BE9/2000E53D.txt" \
@@ -107,3 +108,5 @@
 plugin.sources = $${TARGET}.dll
 plugin.path = $$PLUGIN_STUB_PATH
 DEPLOYMENT += plugin
+    
+TRANSLATIONS = mailips.ts