--- a/homescreenapp/examples/batterywidgetplugin/batterywidgetplugin.pro	Thu Sep 02 20:17:27 2010 +0300
+++ b/homescreenapp/examples/batterywidgetplugin/batterywidgetplugin.pro	Fri Sep 17 08:27:54 2010 +0300
@@ -25,37 +25,50 @@
 
 symbian: {
 
-    DESTDIR = /private/20022F35/import/widgetregistry/20022F7A
+    WIDGET_DIR = /private/20022F35/import/widgetregistry/20022F7A
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
     TARGET.UID3 = 0x20022F7A
     TARGET.EPOCALLOWDLLDATA=1
     TARGET.CAPABILITY = ALL -TCB
     
-    plugins.path = $${DESTDIR}
+    plugins.path = /resource/qt/plugins/homescreen
     plugins.sources = $${TARGET}.dll 
     
-    widgetResources.path = $${DESTDIR}
-    widgetResources.sources += resource/$${TARGET}.xml    
+    CONFIG += qtservice
+    QTSERVICE.DESCRIPTOR = resource/$${TARGET}.xml
+    
+    widgetResources.path = $${WIDGET_DIR}
     widgetResources.sources += resource/$${TARGET}.manifest
+    widgetResources.sources += resource/$${TARGET}.xml
     widgetResources.sources += resource/$${TARGET}.png
     widgetResources.sources += resource/batterywidget_bg.png
         
     DEPLOYMENT += plugins \
                   widgetResources
-} else {
+} 
+
+win32: {
+
     CONFIG(debug, debug|release) {
-      SUBDIRPART = debug
+      TARGET_DIR = debug
     } else {
-      SUBDIRPART = release
-    }    
+      TARGET_DIR = release
+    }        
+    
+    HOMESCREEN_DIR = $$PWD/../../../../bin/$${TARGET_DIR}
     
-    PLUGIN_SUBDIR = /private/20022F35/import/widgetregistry/20022F7A
-    
-    DESTDIR = $$PWD/../../../../bin/$${SUBDIRPART}/$${PLUGIN_SUBDIR}
+    PLUGIN_DIR = $${HOMESCREEN_DIR}/resource/qt/plugins/homescreen
+    WIDGET_DIR = $${HOMESCREEN_DIR}/private/20022F35/import/widgetregistry/20022F7A
+
+    DESTDIR = $${PLUGIN_DIR}
 
-    manifest.path = $${DESTDIR}
-    manifest.files = ./resource/*.manifest ./resource/*.xml ./resource/*.png ./resource/*.svg
+    widgetResources.path = $${WIDGET_DIR}
+    widgetResources.files = ./resource/*.manifest \
+                            ./resource/*.xml \
+                            ./resource/*.png \
+                            ./resource/*.svg
     
-    INSTALLS += manifest    
+    INSTALLS += widgetResources    
+
 }