--- a/qtmobility/plugins/sensors/symbian/symbian.pro	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/symbian.pro	Wed Jun 23 19:08:38 2010 +0300
@@ -1,5 +1,4 @@
-INCLUDEPATH+=../../../src/sensors
-INCLUDEPATH+=../../sensors \epoc32\include\osextensions
+INCLUDEPATH+=$$(EPOCROOT)epoc32\include\osextensions
 
 PLUGIN_TYPE = sensors
 
@@ -8,10 +7,9 @@
 TARGET = $$qtLibraryTarget(qtsensors_sym)
 
 include(version.pri)
-#include(symbian.pri)
 include(../../../common.pri)
 
-SOURCES +=  \			
+SOURCES +=  \
 			sensorbackendsym.cpp \
 			proximitysensorsym.cpp \
 			ambientlightsensorsym.cpp \
@@ -20,10 +18,10 @@
 			accelerometersym.cpp \
 			orientationsym.cpp \
 			rotationsensorsym.cpp \
-			tapsensorsym.cpp \			
+			tapsensorsym.cpp \
 			main.cpp \
 			
-PRIVATE_HEADERS += \
+HEADERS += \
 			sensorbackendsym.h \
 			sensorbackenddatasym.h \
 			proximitysensorsym.h \
@@ -35,28 +33,18 @@
 			rotationsensorsym.h \
 			tapsensorsym.h \
            
-HEADERS = $$PRIVATE_HEADERS
-
-#SYSTEM_INCLUDE += ../../sensors
-
-LIBS += -lqtsensors
 QT=core
 CONFIG+=mobility
 MOBILITY+=sensors
-DEFINES+=QT_MAKEDLL
 
 symbian {
+    TARGET.EPOCALLOWDLLDATA = 1
     TARGET.UID3 = 0x2002BFC8
     TARGET.CAPABILITY = ALL -TCB    
     LIBS += -lSensrvClient
     LIBS += -lsensrvutil   
-}
-symbian: {
-    # Load predefined include paths (e.g. QT_PLUGINS_BASE_DIR) to be used in the pro-files
-    load(data_caging_paths)
- 
-    # Defines plugin files into Symbian .pkg package
-    pluginDep.sources = qtsensors_sym.dll
+
+    pluginDep.sources = $${TARGET}.dll
     pluginDep.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE}
     DEPLOYMENT += pluginDep
 }