--- a/javauis/eswt_qt/org.eclipse.swt/Eclipse_SWT_PI/qt/library/swt.pro	Thu May 27 12:49:31 2010 +0300
+++ b/javauis/eswt_qt/org.eclipse.swt/Eclipse_SWT_PI/qt/library/swt.pro	Fri Jun 11 13:33:44 2010 +0300
@@ -9,19 +9,18 @@
 #     Nokia Corporation - initial implementation
 #******************************************************************************/
 
-TEMPLATE = lib
-TARGET = eswtqt
+SWTLIBNAME = eswtqt
+SWTGENERATEDDIR = $$PWD/generated/$$SWTLIBNAME
 
-QT += core \
-      gui \
-      webkit
+TEMPLATE = lib
+TARGET = $$SWTLIBNAME
 
-MOC_DIR= ./generated
+MOC_DIR= $$SWTGENERATEDDIR
 include(eswt_widgets.pri)
 include(./graphics/graphics.pri)
 
 unix {
-    INCLUDEPATH +=$(JAVA_HOME)/include \
+    INCLUDEPATH += $(JAVA_HOME)/include \
         $(JAVA_HOME)/include/linux
 }
 
@@ -29,39 +28,6 @@
     INCLUDEPATH += $(JAVA_HOME)/include \
         $(JAVA_HOME)/include/win32
 
-        # Required for win32, can be replaced with an auto-generate
-        DEF_FILE = swt.def
+    # Required for win32, can be replaced with an auto-generate
+    DEF_FILE = swt.def
 }
-
-symbian {
-    TARGET.UID =0x101FD687
-    TARGET.CAPABILITY ="ALL -TCB"
-
-    # Temporarily allow WSD, to be removed later if possible
-    TARGET.EPOCALLOWDLLDATA = 1
-
-    # Prepend to includepath to avoid problems with Qt's overriding files
-    INCLUDEPATH = \epoc32\include \
-                  \epoc32\include\stdapis \
-                  \epoc32\include\osextensions\stdapis\sys \
-                  \epoc32\include\osextensions\stdapis\stlport \
-                  \epoc32\include\osextensions\stdapis\stlport\stl \
-                  $$INCLUDEPATH
-
-    INCLUDEPATH += \epoc32\include\middleware \
-                   \epoc32\include\domain\middleware
-
-    # J9 VM specific definitions
-    DEFINES+=J9EPOC32
-
-    # Std cpp requirements
-    LIBS += -llibc
-    LIBS += -leuser
-    LIBS += -llibstdcpp
-    
-    DEFINES+= MACRO_WCHAR_T_DECLARED
-    QMAKE_CXXFLAGS.CW += -wchar_t on
-
-    # jni lookup
-    SOURCES += $$PWD/generated/jni_lookup.cpp
-}