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

1 files changed, 14 insertions, 21 deletions

diff --git a/src/s60main/qts60main_mcrt0.cpp b/src/s60main/qts60main_mcrt0.cpp
index 49a47bd..f591c89 100644
--- a/src/s60main/qts60main_mcrt0.cpp
+++ b/src/s60main/qts60main_mcrt0.cpp
@@ -51,13 +51,13 @@
 #ifdef __ARMCC__
 __asm int CallMain(int argc, char *argv[], char *envp[])
 {
-       import main
-       code32
-       b main
+    import main
+    code32
+    b main
 }
 #define CALLMAIN(argc, argv, envp) CallMain(argc, argv, envp)
 #else
-extern "C" int main (int argc, char *argv[], char *envp[]);
+extern "C" int main(int argc, char *argv[], char *envp[]);
 #define CALLMAIN(argc, argv, envp) main(argc, argv, envp)
 #endif
 
@@ -67,28 +67,21 @@ extern "C" GLDEF_C int __GccGlueInit()
     return 0;
 }
 
-extern "C" IMPORT_C void exit (int ret);
+extern "C" IMPORT_C void exit(int ret);
 
 GLDEF_C TInt QtMainWrapper()
 {
-    int argc=0;
-    char **argv=0;
-    char **envp=0;
+    int argc = 0;
+    char **argv = 0;
+    char **envp = 0;
     // get args & environment
-    __crt0(argc,argv,envp);
+    __crt0(argc, argv, envp);
     CleanupArrayDelete<char*>::PushL(argv);
     CleanupArrayDelete<char*>::PushL(envp);
     //Call user(application)'s main
-	int ret = 0;
-	try
-		{
-		ret = CALLMAIN(argc, argv, envp);
-    	}
-    catch (...)
-    	{
-    	User::Leave(KErrGeneral);
-    	}
-    CleanupStack::PopAndDestroy(2,argv);
+    int ret = 0;
+    QT_TRYCATCH_LEAVING(ret = CALLMAIN(argc, argv, envp););
+    CleanupStack::PopAndDestroy(2, argv);
     return ret;
 }
 
@@ -96,10 +89,10 @@ GLDEF_C TInt QtMainWrapper()
 #ifdef __GCC32__
 
 /* stub function inserted into main() by GCC */
-extern "C" void __gccmain (void) {}
+extern "C" void __gccmain(void) {}
 
 /* Default GCC entrypoint */
-extern "C" TInt _mainCRTStartup (void) 
+extern "C" TInt _mainCRTStartup(void)
 {
     extern TInt _E32Startup();
     return _E32Startup();