diff -r b72c6db6890b -r 5dc02b23752f src/gui/gui.pro
--- a/src/gui/gui.pro	Wed Jun 23 19:07:03 2010 +0300
+++ b/src/gui/gui.pro	Tue Jul 06 15:10:48 2010 +0300
@@ -41,7 +41,7 @@
 include(effects/effects.pri)
 
 include(egl/egl.pri)
-
+win32:!wince*: DEFINES += QT_NO_EGL
 embedded: QT += network
 
 QMAKE_LIBS += $$QMAKE_LIBS_GUI
@@ -51,12 +51,14 @@
 QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtGui.dynlist
 
 DEFINES += Q_INTERNAL_QAPP_SRC
-symbian: {
+symbian {
     TARGET.UID3=0x2001B2DD
 
-    # ro-section in gui can exceed default allocated space, so move rw-section a little further
-    QMAKE_LFLAGS.ARMCC += --rw-base 0x800000
-    QMAKE_LFLAGS.GCCE += -Tdata 0xC00000
+    symbian-abld|symbian-sbsv2 {
+        # ro-section in gui can exceed default allocated space, so move rw-section a little further
+        QMAKE_LFLAGS.ARMCC += --rw-base 0x800000
+        QMAKE_LFLAGS.GCCE += -Tdata 0xC00000
+    }
 
     # Partial upgrade SIS file
     vendorinfo = \
@@ -69,7 +71,7 @@
     pu_header = "; Partial upgrade package for testing QtGui changes without reinstalling everything" \
                 "$${LITERAL_HASH}{\"Qt gui\"}, (0x2001E61C), $${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION}, TYPE=PU"
     partial_upgrade.pkg_prerules = pu_header vendorinfo
-    partial_upgrade.sources = qtgui.dll
+    partial_upgrade.sources = $$QMAKE_LIBDIR_QT/QtGui.dll
     partial_upgrade.path = c:/sys/bin
     DEPLOYMENT = partial_upgrade $$DEPLOYMENT
 }