--- a/phoneplugins/infowidgetplugin/infowidgetplugin.pri	Wed Jun 23 18:12:20 2010 +0300
+++ b/phoneplugins/infowidgetplugin/infowidgetplugin.pri	Tue Jul 06 14:15:47 2010 +0300
@@ -1,69 +1,47 @@
-#
 # Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
 # under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
 # Initial Contributors:
 # Nokia Corporation - initial contribution.
-#
 # Contributors:
-#
 # Description:
-#
-#
-
 HEADERS += ./inc/infowidgetplugin.h \
-           ./inc/infowidgetlogging.h \
-           ./infowidget/inc/infowidget.h \
-           ./infowidget/inc/infowidgetlayoutmanager.h \
-           ./infowidget/inc/infowidgetpreferences.h \
-           ./infowidget/inc/infowidgetengine.h \
-           ./infowidget/inc/infowidgetsathandlerprivate.h
-
-symbian: {
-    HEADERS += ./infowidget/inc/infowidgetnetworkhandler.h \
-               ./infowidget/inc/infowidgetsathandler.h \
-               ./infowidget/inc/infowidgetlinehandler.h
-}
-SOURCES += infowidget/src/infowidgetsathandlerprivate.cpp \
+    ./inc/infowidgetlogging.h \
+    ./infowidget/inc/infowidget.h \
+    ./infowidget/inc/infowidgetlayoutmanager.h \
+    ./infowidget/inc/infowidgetpreferences.h \
+    ./infowidget/inc/infowidgetengine.h     
+symbian::HEADERS += ./infowidget/inc/infowidgetnetworkhandler.h \
+    ./infowidget/inc/infowidgetsathandler.h \
+    ./infowidget/inc/infowidgetsathandler_p.h \
+    ./infowidget/inc/infowidgetlinehandler.h
+SOURCES += infowidget/src/infowidgetsathandler_p.cpp \
     ./src/infowidgetplugin.cpp \
     ./infowidget/src/infowidget.cpp \
     ./infowidget/src/infowidgetlayoutmanager.cpp \
-    ./infowidget/src/infowidgetengine.cpp
+    ./infowidget/src/infowidgetpreferences.cpp 
+symbian::SOURCES += ./infowidget/src/infowidgetengine.cpp \
+    ./infowidget/src/infowidgetnetworkhandler.cpp \
+    ./infowidget/src/infowidgetsathandler.cpp \
+    ./infowidget/src/infowidgetlinehandler.cpp
+else::SOURCES += ./infowidget/src/infowidgetengine_s.cpp 
     
-symbian: {
-    SOURCES += ./infowidget/src/infowidgetpreferences.cpp \
-               ./infowidget/src/infowidgetnetworkhandler.cpp \
-               ./infowidget/src/infowidgetsathandler.cpp \
-               ./infowidget/src/infowidgetlinehandler.cpp 
-} else: { 
-    SOURCES += ./infowidget/src/infowidgetengine_s.cpp \
-               ./infowidget/src/infowidgetpreferences_s.cpp
+defineTest(exportResources):symbian { 
+    for(subdirs, 1) { 
+        entries = $$files($$subdirs)
+        for(entry, entries):BLD_INF_RULES.prj_exports += "./$$entry z:/$$replace(2, ^/,)/$$basename(entry)"
+    }
+    export ( BLD_INF_RULES.prj_exports)
 }
-
-defineTest(exportResources) {
-    symbian {
-        for(subdirs, 1) {
-            entries = $$files($$subdirs)
-            for(entry, entries) : BLD_INF_RULES.prj_exports += "./$$entry z:/$$replace(2, ^/,)/$$basename(entry)"
-        }
-        export ( BLD_INF_RULES.prj_exports)
-    }
-}
-
-symbian: plugin { # copy qtstub and manifest
-
+symbian:plugin { # copy qtstub and manifest
     pluginstub.sources = $${TARGET}.dll
     pluginstub.path = $$PLUGIN_SUBDIR
-
     DEPLOYMENT += pluginstub
-
     qtplugins.path = $$PLUGIN_SUBDIR
     qtplugins.sources += qmakepluginstubs/$${TARGET}.qtplugin
     contains(MOBILITY, serviceframework):BLD_INF_RULES.prj_exports += "resource/$${TARGET}.xml z:$$qtplugins.path/$${TARGET}.xml"
-    
     for(qtplugin, qtplugins.sources):BLD_INF_RULES.prj_exports += "./$$qtplugin z:$$qtplugins.path/$$basename(qtplugin)"
 }