Merge commit 'origin/master'

Conflicts:
	src/corelib/global/qglobal.h
	src/corelib/kernel/qmetatype.cpp
	src/corelib/kernel/qobject.cpp
	src/corelib/thread/qthread_unix.cpp
	src/gui/graphicsview/qgraphicssceneevent.h
	src/gui/itemviews/qheaderview.h
	src/gui/kernel/qapplication_qws.cpp
	src/gui/kernel/qgesture.h
	src/gui/kernel/qgesturerecognizer.h
	src/gui/painting/qpaintengine_raster.cpp
	src/network/access/qhttpnetworkreply.cpp
	src/network/access/qnetworkcookie.h
	src/network/socket/qnativesocketengine_unix.cpp

10 files changed, 15 insertions, 18 deletions

diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h
index 6148b14..7585b4a 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h
@@ -53,7 +53,7 @@ class QDirectFBPaintEnginePrivate;
 
 class QDirectFBPaintEngine : public QRasterPaintEngine
 {
-    Q_DECLARE_PRIVATE(QDirectFBPaintEngine)
+    Q_DECLARE_SCOPED_PRIVATE(QDirectFBPaintEngine)
 public:
     QDirectFBPaintEngine(QPaintDevice *device);
     virtual ~QDirectFBPaintEngine();
diff --git a/src/plugins/imageformats/mng/qmnghandler.h b/src/plugins/imageformats/mng/qmnghandler.h
index b9e37bf..aa6efd3 100644
--- a/src/plugins/imageformats/mng/qmnghandler.h
+++ b/src/plugins/imageformats/mng/qmnghandler.h
@@ -74,7 +74,7 @@ class QMngHandler : public QImageIOHandler
     virtual bool supportsOption(ImageOption option) const;
 
     private:
-    Q_DECLARE_PRIVATE(QMngHandler)
+    Q_DECLARE_SCOPED_PRIVATE(QMngHandler)
     QScopedPointer<QMngHandlerPrivate> d_ptr;
 };
 
diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri
index b14f839..10563c1 100644
--- a/src/plugins/qpluginbase.pri
+++ b/src/plugins/qpluginbase.pri
@@ -16,6 +16,6 @@ wince*:LIBS += $$QMAKE_LIBS_GUI
 
 symbian: {
     TARGET.EPOCALLOWDLLDATA=1
-    TARGET.CAPABILITY = All -Tcb        
+    TARGET.CAPABILITY = All -Tcb
     load(armcc_warnings)
 }
diff --git a/src/plugins/s60/5_0/5_0.pro b/src/plugins/s60/5_0/5_0.pro
index 878a466..d7c3cb2 100644
--- a/src/plugins/s60/5_0/5_0.pro
+++ b/src/plugins/s60/5_0/5_0.pro
@@ -8,7 +8,7 @@ contains(S60_VERSION, 3.1) {
 } else {
     SOURCES += ../src/qlocale_3_2.cpp \
         ../src/qdesktopservices_3_2.cpp
-    LIBS += -ldirectorylocalizer    
+    LIBS += -ldirectorylocalizer
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 }
 
diff --git a/src/plugins/s60/bwins/qts60pluginu.def b/src/plugins/s60/bwins/qts60pluginu.def
index 549f71f..a082262 100644
--- a/src/plugins/s60/bwins/qts60pluginu.def
+++ b/src/plugins/s60/bwins/qts60pluginu.def
@@ -4,4 +4,3 @@ EXPORTS
 	?defaultGetLongDateFormatSpec@@YA?AVTPtrC16@@AAVTExtendedLocale@@@Z @ 3 NONAME ; class TPtrC16 defaultGetLongDateFormatSpec(class TExtendedLocale &)
 	?defaultGetShortDateFormatSpec@@YA?AVTPtrC16@@AAVTExtendedLocale@@@Z @ 4 NONAME ; class TPtrC16 defaultGetShortDateFormatSpec(class TExtendedLocale &)
 	?localizedDirectoryName@@YA?AVQString@@AAV1@@Z @ 5 NONAME ; class QString localizedDirectoryName(class QString &)
-
diff --git a/src/plugins/s60/eabi/qts60pluginu.def b/src/plugins/s60/eabi/qts60pluginu.def
index a433a5d..d768436 100644
--- a/src/plugins/s60/eabi/qts60pluginu.def
+++ b/src/plugins/s60/eabi/qts60pluginu.def
@@ -4,4 +4,3 @@ EXPORTS
 	_Z28defaultGetLongDateFormatSpecR15TExtendedLocale @ 3 NONAME
 	_Z29defaultGetShortDateFormatSpecR15TExtendedLocale @ 4 NONAME
 	_Z22localizedDirectoryNameR7QString @ 5 NONAME
-
diff --git a/src/plugins/s60/s60pluginbase.pri b/src/plugins/s60/s60pluginbase.pri
index 62100f9..0e11c7e 100644
--- a/src/plugins/s60/s60pluginbase.pri
+++ b/src/plugins/s60/s60pluginbase.pri
@@ -1,4 +1,4 @@
-# Note: These version based 'plugins' are not an actual Qt plugins, 
+# Note: These version based 'plugins' are not an actual Qt plugins,
 # they are just regular runtime loaded libraries
 include(../../qpluginbase.pri)
 
diff --git a/src/plugins/s60/src/qdesktopservices_3_1.cpp b/src/plugins/s60/src/qdesktopservices_3_1.cpp
index 0551a74..0f8e6a6 100644
--- a/src/plugins/s60/src/qdesktopservices_3_1.cpp
+++ b/src/plugins/s60/src/qdesktopservices_3_1.cpp
@@ -47,4 +47,3 @@ EXPORT_C QString localizedDirectoryName(QString&)
     qWarning("QDesktopServices::displayName() not implemented for this platform version");
     return QString();
 }
-
diff --git a/src/plugins/s60/src/qdesktopservices_3_2.cpp b/src/plugins/s60/src/qdesktopservices_3_2.cpp
index cbdc810..3708436 100644
--- a/src/plugins/s60/src/qdesktopservices_3_2.cpp
+++ b/src/plugins/s60/src/qdesktopservices_3_2.cpp
@@ -52,14 +52,16 @@ EXPORT_C QString localizedDirectoryName(QString& rawPath)
     QString ret;
 
     TRAPD(err,
-        CDirectoryLocalizer* localizer = CDirectoryLocalizer::NewL();
-        CleanupStack::PushL(localizer);
-        localizer->SetFullPath(qt_QString2TPtrC(QDir::toNativeSeparators(rawPath)));
-        if(localizer->IsLocalized()){
-            TPtrC locName(localizer->LocalizedName());
-            ret = qt_TDesC2QStringL(locName);
-        }
-        CleanupStack::PopAndDestroy(localizer);
+        QT_TRYCATCH_LEAVING(
+            CDirectoryLocalizer* localizer = CDirectoryLocalizer::NewL();
+            CleanupStack::PushL(localizer);
+            localizer->SetFullPath(qt_QString2TPtrC(QDir::toNativeSeparators(rawPath)));
+            if(localizer->IsLocalized()){
+                TPtrC locName(localizer->LocalizedName());
+                ret = qt_TDesC2QString(locName);
+            }
+            CleanupStack::PopAndDestroy(localizer);
+        )
     )
 
     if (err != KErrNone)
@@ -75,4 +77,3 @@ EXPORT_C QString localizedDirectoryName(QString& /* rawPath */)
     return QString();
 }
 #endif
-
diff --git a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro
index 0574341..4734144 100644
--- a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro
+++ b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro
@@ -3,4 +3,3 @@ TEMPLATE = subdirs
 
 # We just want to extract the zip file containing sqlite binaries for Symbian
 BLD_INF_RULES.prj_exports +=  ":zip SQLite3_v9.2.zip"
-