Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
	examples/webkit/fancybrowser/fancybrowser.pro
	src/3rdparty/libpng/ANNOUNCE
	src/3rdparty/libpng/CHANGES
	src/3rdparty/libpng/CMakeLists.txt
	src/3rdparty/libpng/LICENSE
	src/3rdparty/libpng/README
	src/3rdparty/libpng/configure.ac
	src/3rdparty/libpng/example.c
	src/3rdparty/libpng/libpng-manual.txt
	src/3rdparty/libpng/libpng.3
	src/3rdparty/libpng/libpngpf.3
	src/3rdparty/libpng/png.5
	src/3rdparty/libpng/png.c
	src/3rdparty/libpng/png.h
	src/3rdparty/libpng/pngconf.h
	src/3rdparty/libpng/pngerror.c
	src/3rdparty/libpng/pnginfo.h
	src/3rdparty/libpng/pnglibconf.h
	src/3rdparty/libpng/pngmem.c
	src/3rdparty/libpng/pngpread.c
	src/3rdparty/libpng/pngpriv.h
	src/3rdparty/libpng/pngread.c
	src/3rdparty/libpng/pngrtran.c
	src/3rdparty/libpng/pngrutil.c
	src/3rdparty/libpng/pngset.c
	src/3rdparty/libpng/pngstruct.h
	src/3rdparty/libpng/pngtest.c
	src/3rdparty/libpng/pngtrans.c
	src/3rdparty/libpng/pngvalid.c
	src/3rdparty/libpng/pngwrite.c
	src/3rdparty/libpng/pngwtran.c
	src/3rdparty/libpng/pngwutil.c
	src/gui/dialogs/qfiledialog_symbian.cpp
	src/gui/kernel/qsoftkeymanager.cpp
	src/s60installs/s60installs.pro

1 files changed, 2 insertions, 2 deletions

diff --git a/examples/webkit/fancybrowser/fancybrowser.pro b/examples/webkit/fancybrowser/fancybrowser.pro
index 1ed212e..9d3d27e 100644
--- a/examples/webkit/fancybrowser/fancybrowser.pro
+++ b/examples/webkit/fancybrowser/fancybrowser.pro
@@ -12,8 +12,8 @@ INSTALLS += target sources
 
 symbian {
     TARGET.UID3 = 0xA000CF6C
-    TARGET.EPOCHEAPSIZE = 0×020000 0×4000000
-    TARGET.CAPABILITY += NetworkServices
+    TARGET.EPOCHEAPSIZE = 0x1000 0x8000000
+    TARGET.CAPABILITY += Location NetworkServices
     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 }
 maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)