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, 3 insertions, 3 deletions

diff --git a/src/gui/dialogs/qfiledialog_symbian.cpp b/src/gui/dialogs/qfiledialog_symbian.cpp
index cd020f6..1ffbf1d 100644
--- a/src/gui/dialogs/qfiledialog_symbian.cpp
+++ b/src/gui/dialogs/qfiledialog_symbian.cpp
@@ -44,7 +44,7 @@
 #ifndef QT_NO_FILEDIALOG
 
 #include <private/qfiledialog_p.h>
-#if defined(Q_WS_S60) && !defined(SYMBIAN_VERSION_9_4)
+#if defined(Q_WS_S60) && !defined(SYMBIAN_VERSION_9_4) && !defined(SYMBIAN_VERSION_9_3) && !defined(SYMBIAN_VERSION_9_2)
 #include <driveinfo.h>
 #include <AknCommonDialogsDynMem.h>
 #include <CAknMemorySelectionDialogMultiDrive.h>
@@ -58,7 +58,7 @@ extern QStringList qt_make_filter_list(const QString &filter); // defined in qfi
 extern QStringList qt_clean_filter_list(const QString &filter); // defined in qfiledialog.cpp
 
 enum DialogMode { DialogOpen, DialogSave, DialogFolder };
-#if defined(Q_WS_S60) && !defined(SYMBIAN_VERSION_9_4)
+#if defined(Q_WS_S60) && !defined(SYMBIAN_VERSION_9_4) && !defined(SYMBIAN_VERSION_9_3) && !defined(SYMBIAN_VERSION_9_2)
 class CExtensionFilter : public CBase, public MAknFileFilter
 {
 public:
@@ -104,7 +104,7 @@ static QString launchSymbianDialog(const QString dialogCaption, const QString st
                                    const QString filter, DialogMode dialogMode)
 {
     QString selection;
-#if defined(Q_WS_S60) && !defined(SYMBIAN_VERSION_9_4)
+#if defined(Q_WS_S60) && !defined(SYMBIAN_VERSION_9_4) && !defined(SYMBIAN_VERSION_9_3) && !defined(SYMBIAN_VERSION_9_2)
     TFileName startFolder;
     if (!startDirectory.isEmpty()) {
         QString dir = QDir::toNativeSeparators(QFileDialogPrivate::workingDirectory(startDirectory));