summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-08-17 08:41:03 (GMT)
committeraxis <qt-info@nokia.com>2009-08-26 11:24:44 (GMT)
commitb3a703901e9adbe80e67ca4700c589596d009247 (patch)
tree06bf787339b7bc1835390480473114fb6c2c0543 /src
parent1e87709059dcf10e41c0781d4b97ce143543e4a4 (diff)
downloadQt-b3a703901e9adbe80e67ca4700c589596d009247.zip
Qt-b3a703901e9adbe80e67ca4700c589596d009247.tar.gz
Qt-b3a703901e9adbe80e67ca4700c589596d009247.tar.bz2
Use custom S60 framework construction instead of RunApplication().
Conflicts: src/s60main/qts60main.cpp
Diffstat (limited to 'src')
-rw-r--r--src/s60main/qts60main.cpp17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/s60main/qts60main.cpp b/src/s60main/qts60main.cpp
index 4112424..c6e74c3 100644
--- a/src/s60main/qts60main.cpp
+++ b/src/s60main/qts60main.cpp
@@ -42,6 +42,9 @@
// INCLUDE FILES
#include <exception>
#include <eikstart.h>
+#include <apparc.h>
+#include <eikenv.h>
+
#include "qts60mainapplication_p.h"
/**
@@ -58,5 +61,17 @@ LOCAL_C CApaApplication* NewApplication()
*/
GLDEF_C TInt E32Main()
{
- return EikStart::RunApplication(NewApplication);
+ TApaApplicationFactory factory(NewApplication);
+ CApaCommandLine* commandLine=NULL;
+ TInt err = CApaCommandLine::GetCommandLineFromProcessEnvironment(commandLine);
+ CEikonEnv* coe=new CEikonEnv;
+ TRAP(err, coe->ConstructAppFromCommandLineL(factory,*commandLine));
+ delete commandLine;
+
+ CActiveScheduler::Start();
+
+ coe->PrepareToExit();
+ coe->DestroyEnvironment();
+
+ return 0;
}