Merge branch 'minimizeWrapperApp' into 4.6

9 files changed, 13 insertions, 822 deletions

diff --git a/src/s60main/qts60main.cpp b/src/s60main/qts60main.cpp
index bac8f3ab83..2b17b273fd 100644
--- a/src/s60main/qts60main.cpp
+++ b/src/s60main/qts60main.cpp
@@ -40,17 +40,10 @@
 ****************************************************************************/
 
 // INCLUDE FILES
-#include <exception>
-#include <eikstart.h>
-#include "qts60mainapplication_p.h"
+#include <e32base.h>
+#include <qglobal.h>
 
-/**
- * factory function to create the QtS60Main application class
- */
-LOCAL_C CApaApplication* NewApplication()
-{
-    return new CQtS60MainApplication;
-}
+GLDEF_C TInt QtMainWrapper();
 
 /**
  * A normal Symbian OS executable provides an E32Main() function which is
@@ -58,5 +51,10 @@ LOCAL_C CApaApplication* NewApplication()
  */
 GLDEF_C TInt E32Main()
 {
-    return EikStart::RunApplication(NewApplication);
+    CTrapCleanup *cleanupStack = q_check_ptr(CTrapCleanup::New());
+    TInt err = 0;
+    TRAP(err, QtMainWrapper());
+    delete cleanupStack;
+
+    return err;
 }
diff --git a/src/s60main/qts60main_mcrt0.cpp b/src/s60main/qts60main_mcrt0.cpp
index ea6132fe2b..4a30380bee 100644
--- a/src/s60main/qts60main_mcrt0.cpp
+++ b/src/s60main/qts60main_mcrt0.cpp
@@ -51,6 +51,9 @@
 #include <e32base.h>
 #include "estlib.h"
 
+// Needed for QT_TRYCATCH_LEAVING.
+#include <qglobal.h>
+
 #ifdef __ARMCC__
 __asm int CallMain(int argc, char *argv[], char *envp[])
 {
diff --git a/src/s60main/qts60mainapplication.cpp b/src/s60main/qts60mainapplication.cpp
deleted file mode 100644
index f4e7deffd5..0000000000
--- a/src/s60main/qts60mainapplication.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Symbian application wrapper of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights.  These rights are described in the Nokia Qt LGPL
-** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// INCLUDE FILES
-#include <exception>
-#include "qts60maindocument_p.h"
-#include "qts60mainapplication_p.h"
-#include <bautils.h>
-#include <coemain.h>
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-
-_LIT(KQtWrapperResourceFile, "\\resource\\apps\\s60main.rsc");
-
-// -----------------------------------------------------------------------------
-// CQtS60MainApplication::CreateDocumentL()
-// Creates CApaDocument object
-// -----------------------------------------------------------------------------
-//
-CApaDocument* CQtS60MainApplication::CreateDocumentL()
-{
-    // Create an QtS60Main document, and return a pointer to it
-    return (static_cast<CApaDocument*>(CQtS60MainDocument::NewL(*this)));
-}
-
-// -----------------------------------------------------------------------------
-// CQtS60MainApplication::AppDllUid()
-// Returns application UID
-// -----------------------------------------------------------------------------
-//
-TUid CQtS60MainApplication::AppDllUid() const
-{
-    // Return the UID for the QtS60Main application
-    return ProcessUid();
-}
-
-// -----------------------------------------------------------------------------
-// CQtS60MainApplication::ResourceFileName()
-// Returns application resource filename
-// -----------------------------------------------------------------------------
-//
-TFileName CQtS60MainApplication::ResourceFileName() const
-{
-    TFindFile finder(iCoeEnv->FsSession());
-    TInt err = finder.FindByDir(KQtWrapperResourceFile, KNullDesC);
-    if (err == KErrNone)
-        return finder.File();
-    return KNullDesC();
-}
-
-
-// End of File
diff --git a/src/s60main/qts60mainapplication_p.h b/src/s60main/qts60mainapplication_p.h
deleted file mode 100644
index f9d2ebbc72..0000000000
--- a/src/s60main/qts60mainapplication_p.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Symbian application wrapper of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights.  These rights are described in the Nokia Qt LGPL
-** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef __QtS60MainAPPLICATION_H__
-#define __QtS60MainAPPLICATION_H__
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-// INCLUDES
-#include <aknapp.h>
-
-// CLASS DECLARATION
-
-static TUid ProcessUid()
-    {
-    RProcess me;
-    TSecureId securId = me.SecureId();
-    me.Close();
-    return securId.operator TUid();
-    }
-
-/**
-* CQtS60MainApplication application class.
-* Provides factory to create concrete document object.
-* An instance of CQtS60MainApplication is the application part of the
-* AVKON application framework for the QtS60Main example application.
-*/
-class CQtS60MainApplication : public CAknApplication
-    {
-    public: // Functions from base classes
-
-        /**
-        * From CApaApplication, AppDllUid.
-        * @return Application's UID (KUidQtS60MainApp).
-        */
-        TUid AppDllUid() const;
-
-        /**
-        * From CApaApplication, ResourceFileName
-        * @return Application's resource filename (KUidQtS60MainApp).
-        */
-        TFileName ResourceFileName() const;
-
-    protected: // Functions from base classes
-
-        /**
-        * From CApaApplication, CreateDocumentL.
-        * Creates CQtS60MainDocument document object. The returned
-        * pointer in not owned by the CQtS60MainApplication object.
-        * @return A pointer to the created document object.
-        */
-        CApaDocument* CreateDocumentL();
-    };
-
-#endif // __QtS60MainAPPLICATION_H__
-
-// End of File
diff --git a/src/s60main/qts60mainappui.cpp b/src/s60main/qts60mainappui.cpp
deleted file mode 100644
index eb3b62a974..0000000000
--- a/src/s60main/qts60mainappui.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Symbian application wrapper of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights.  These rights are described in the Nokia Qt LGPL
-** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// INCLUDE FILES
-#include <exception>
-#include <avkon.hrh>
-#include <eikmenub.h>
-#include <eikmenup.h>
-#include <barsread.h>
-#include <s60main.rsg>
-#include <avkon.rsg>
-
-#include "qts60mainappui_p.h"
-#include <QtGui/qapplication.h>
-#include <QtGui/qmenu.h>
-#include <QtGui/private/qt_s60_p.h>
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-
-// -----------------------------------------------------------------------------
-// CQtS60MainAppUi::ConstructL()
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CQtS60MainAppUi::ConstructL()
-{
-    // Cone's heap and handle checks on app destruction are not suitable for Qt apps, as many
-    // objects can still exist in static data at that point. Instead we will print relevant information
-    // so that comparative checks may be made for memory leaks, using ~SPrintExitInfo in corelib.
-    iEikonEnv->DisableExitChecks(ETrue);
-
-    // Initialise app UI with standard value.
-    // ENoAppResourceFile and ENonStandardResourceFile makes UI to work without
-    // resource files in most SDKs. S60 3rd FP1 public seems to require resource file
-    // even these flags are defined
-    BaseConstructL(CAknAppUi::EAknEnableSkin);
-
-    CEikButtonGroupContainer* nativeContainer = Cba();
-    nativeContainer->SetCommandSetL(R_AVKON_SOFTKEYS_EMPTY_WITH_IDS);
-
-    // Create async callback to call Qt main,
-    // this is required to give S60 app FW to finish starting correctly
-    TCallBack callBack(OpenCMainStaticCallBack, this);
-    iAsyncCallBack = new(ELeave) CAsyncCallBack(callBack, CActive::EPriorityIdle);
-    iAsyncCallBack->Call();
-}
-
-// -----------------------------------------------------------------------------
-// CQtS60MainAppUi::CQtS60MainAppUi()
-// C++ default constructor can NOT contain any code, that might leave.
-// -----------------------------------------------------------------------------
-//
-CQtS60MainAppUi::CQtS60MainAppUi()
-{
-    // No implementation required
-}
-
-// -----------------------------------------------------------------------------
-// CQtS60MainAppUi::~CQtS60MainAppUi()
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CQtS60MainAppUi::~CQtS60MainAppUi()
-{
-    delete iAsyncCallBack;
-}
-
-// -----------------------------------------------------------------------------
-// CQtS60MainAppUi::HandleCommandL()
-// Takes care of command handling.
-// -----------------------------------------------------------------------------
-//
-void CQtS60MainAppUi::HandleCommandL(TInt aCommand)
-{
-    if (qApp)
-        qApp->symbianHandleCommand(aCommand);
-}
-
-// -----------------------------------------------------------------------------
-// CQtS60MainAppUi::HandleResourceChangeL()
-// Takes care of event handling.
-// -----------------------------------------------------------------------------
-//
-void CQtS60MainAppUi::HandleResourceChangeL(TInt aType)
-{
-    CAknAppUi::HandleResourceChangeL(aType);
-
-    if (qApp)
-        qApp->symbianResourceChange(aType);
-}
-
-void CQtS60MainAppUi::HandleWsEventL(const TWsEvent& aEvent, CCoeControl *control)
-{
-    int result = 0;
-    if (qApp)
-        QT_TRYCATCH_LEAVING(
-            result = qApp->s60ProcessEvent(const_cast<TWsEvent*>(&aEvent))
-        );
-
-    if (result <= 0)
-        CAknAppUi::HandleWsEventL(aEvent, control);
-}
-
-
-// -----------------------------------------------------------------------------
-//  Called by the framework when the application status pane
-//  size is changed.  Passes the new client rectangle to the
-//  AppView
-// -----------------------------------------------------------------------------
-//
-void CQtS60MainAppUi::HandleStatusPaneSizeChange()
-{
-    HandleResourceChangeL(KInternalStatusPaneChange);
-    HandleStackedControlsResourceChange(KInternalStatusPaneChange);
-}
-
-// -----------------------------------------------------------------------------
-//  Called asynchronously from ConstructL() - passes call to nan static method
-// -----------------------------------------------------------------------------
-//
-TInt CQtS60MainAppUi::OpenCMainStaticCallBack(TAny* aObject)
-{
-    CQtS60MainAppUi* myObj = static_cast<CQtS60MainAppUi*>(aObject);
-    myObj->OpenCMainCallBack();
-    return 0;
-}
-
-#include "qtS60main_mcrt0.cpp"
-
-// -----------------------------------------------------------------------------
-//  Invokes Qt main, the Qt main will block and when we return from there
-//  application should be closed. -> Call Exit();
-// -----------------------------------------------------------------------------
-//
-void CQtS60MainAppUi::OpenCMainCallBack()
-{
-    TInt ret;
-    TRAPD(err, ret = QtMainWrapper());
-    Q_UNUSED(ret);
-    Q_UNUSED(err);
-    Exit();
-}
-
-void CQtS60MainAppUi::DynInitMenuBarL(TInt, CEikMenuBar *)
-{
-}
-
-void CQtS60MainAppUi::DynInitMenuPaneL(TInt aResourceId, CEikMenuPane *aMenuPane)
-{
-    if (aResourceId == R_QT_WRAPPERAPP_MENU) {
-        if (aMenuPane->NumberOfItemsInPane() <= 1)
-            qt_symbian_show_toplevel(aMenuPane);
-
-    } else if (aResourceId != R_AVKON_MENUPANE_FEP_DEFAULT && aResourceId != R_AVKON_MENUPANE_EDITTEXT_DEFAULT && aResourceId != R_AVKON_MENUPANE_LANGUAGE_DEFAULT) {
-        qt_symbian_show_submenu(aMenuPane, aResourceId);
-    }
-}
-
-void CQtS60MainAppUi::RestoreMenuL(CCoeControl* aMenuWindow, TInt aMenuId, TMenuType aMenuType)
-{
-    if ((aMenuId == R_QT_WRAPPERAPP_MENUBAR) || (aMenuId == R_AVKON_MENUPANE_FEP_DEFAULT)) {
-        TResourceReader reader;
-        iCoeEnv->CreateResourceReaderLC(reader, aMenuId);
-        aMenuWindow->ConstructFromResourceL(reader);
-        CleanupStack::PopAndDestroy();
-    }
-
-    if (aMenuType == EMenuPane)
-        DynInitMenuPaneL(aMenuId, (CEikMenuPane*)aMenuWindow);
-    else
-        DynInitMenuBarL(aMenuId, (CEikMenuBar*)aMenuWindow);
-}
-
-// End of File
diff --git a/src/s60main/qts60mainappui_p.h b/src/s60main/qts60mainappui_p.h
deleted file mode 100644
index 7f8d730c0c..0000000000
--- a/src/s60main/qts60mainappui_p.h
+++ /dev/null
@@ -1,146 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Symbian application wrapper of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights.  These rights are described in the Nokia Qt LGPL
-** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef __QtS60MainAPPUI_H__
-#define __QtS60MainAPPUI_H__
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-// INCLUDES
-#include <aknappui.h>
-
-// FORWARD DECLARATIONS
-
-// CLASS DECLARATION
-/**
-* CQtS60MainAppUi application UI class.
-* Interacts with the user through the UI and request message processing
-* from the handler class
-*/
-class CQtS60MainAppUi : public CAknAppUi
-    {
-    public: // Constructors and destructor
-
-        /**
-        * ConstructL.
-        * 2nd phase constructor.
-        */
-        void ConstructL();
-
-        /**
-        * CQtS60MainAppUi.
-        * C++ default constructor. This needs to be public due to
-        * the way the framework constructs the AppUi
-        */
-        CQtS60MainAppUi();
-
-        /**
-        * ~CQtS60MainAppUi.
-        * Virtual Destructor.
-        */
-        virtual ~CQtS60MainAppUi();
-
-    protected:
-        void RestoreMenuL(CCoeControl* aMenuWindow,TInt aMenuId,TMenuType aMenuType);
-        void DynInitMenuBarL(TInt aResourceId, CEikMenuBar *aMenuBar);
-        void DynInitMenuPaneL(TInt aResourceId, CEikMenuPane *aMenuPane);
-
-    private:  // Functions from base classes
-
-        /**
-        * From CEikAppUi, HandleCommandL.
-        * Takes care of command handling.
-        * @param aCommand Command to be handled.
-        */
-        void HandleCommandL( TInt aCommand );
-
-        /**
-        * From CAknAppUi, HandleResourceChangeL
-        * Handles resource change events such as layout switches in global level.
-        * @param aType event type.
-        */
-        void HandleResourceChangeL(TInt aType);
-
-        /**
-        *  HandleStatusPaneSizeChange.
-        *  Called by the framework when the application status pane
-		*  size is changed.
-        */
-		void HandleStatusPaneSizeChange();
-
-        /**
-        *  Static callback method for invoking Qt main.
-        *  Called asynchronously from ConstructL() - passes call to non static method.
-        */
-        static TInt OpenCMainStaticCallBack(  TAny* aObject );
-
-        /**
-        *  Callback method for invoking Qt main.
-        *  Called from static OpenCMainStaticCallBack.
-        */
-        void OpenCMainCallBack();
-
-    protected:
-        void HandleWsEventL(const TWsEvent& aEvent, CCoeControl* aDestination);
-
-
-    private: // Data
-
-        /**
-        * Async callback object to call Qt main
-        * Owned by CQtS60MainAppUi
-        */
-        CAsyncCallBack* iAsyncCallBack;
-
-    };
-
-#endif // __QtS60MainAPPUI_H__
-
-// End of File
diff --git a/src/s60main/qts60maindocument.cpp b/src/s60main/qts60maindocument.cpp
deleted file mode 100644
index 0f134bf3d3..0000000000
--- a/src/s60main/qts60maindocument.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Symbian application wrapper of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights.  These rights are described in the Nokia Qt LGPL
-** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-// INCLUDE FILES
-#include <exception>
-#include "qts60mainappui_p.h"
-#include "qts60maindocument_p.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CQtS60MainDocument::NewL()
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CQtS60MainDocument* CQtS60MainDocument::NewL(CEikApplication& aApp)
-{
-    CQtS60MainDocument* self = NewLC(aApp);
-    CleanupStack::Pop(self);
-    return self;
-}
-
-// -----------------------------------------------------------------------------
-// CQtS60MainDocument::NewLC()
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CQtS60MainDocument* CQtS60MainDocument::NewLC(CEikApplication& aApp)
-{
-    CQtS60MainDocument* self = new(ELeave) CQtS60MainDocument(aApp);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    return self;
-}
-
-// -----------------------------------------------------------------------------
-// CQtS60MainDocument::ConstructL()
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CQtS60MainDocument::ConstructL()
-{
-    // No implementation required
-}
-
-// -----------------------------------------------------------------------------
-// CQtS60MainDocument::CQtS60MainDocument()
-// C++ default constructor can NOT contain any code, that might leave.
-// -----------------------------------------------------------------------------
-//
-CQtS60MainDocument::CQtS60MainDocument(CEikApplication& aApp)
-        : CAknDocument(aApp)
-{
-    // No implementation required
-}
-
-// ---------------------------------------------------------------------------
-// CQtS60MainDocument::~CQtS60MainDocument()
-// Destructor.
-// ---------------------------------------------------------------------------
-//
-CQtS60MainDocument::~CQtS60MainDocument()
-{
-    // No implementation required
-}
-
-// ---------------------------------------------------------------------------
-// CQtS60MainDocument::CreateAppUiL()
-// Constructs CreateAppUi.
-// ---------------------------------------------------------------------------
-//
-CEikAppUi* CQtS60MainDocument::CreateAppUiL()
-{
-    // Create the application user interface, and return a pointer to it;
-    // the framework takes ownership of this object
-    return (static_cast <CEikAppUi*>(new(ELeave)CQtS60MainAppUi));
-}
-
-// End of File
diff --git a/src/s60main/qts60maindocument_p.h b/src/s60main/qts60maindocument_p.h
deleted file mode 100644
index 35d6d85176..0000000000
--- a/src/s60main/qts60maindocument_p.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Symbian application wrapper of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights.  These rights are described in the Nokia Qt LGPL
-** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef __QTS60MAINDOCUMENT_H__
-#define __QTS60MAINDOCUMENT_H__
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-// INCLUDES
-#include <akndoc.h>
-
-// FORWARD DECLARATIONS
-class CQtS60MainAppUi;
-class CEikApplication;
-
-
-// CLASS DECLARATION
-
-/**
-* CQtS60MainDocument application class.
-* An instance of class CQtS60MainDocument is the Document part of the
-* AVKON application framework for the QtS60Main application.
-*/
-class CQtS60MainDocument : public CAknDocument
-    {
-    public: // Constructors and destructor
-
-        /**
-        * NewL.
-        * Two-phased constructor.
-        * Construct a CQtS60MainDocument for the AVKON application aApp
-        * using two phase construction, and return a pointer
-        * to the created object.
-        * @param aApp Application creating this document.
-        * @return A pointer to the created instance of CQtS60MainDocument.
-        */
-        static CQtS60MainDocument* NewL( CEikApplication& aApp );
-
-        /**
-        * NewLC.
-        * Two-phased constructor.
-        * Construct a CQtS60MainDocument for the AVKON application aApp
-        * using two phase construction, and return a pointer
-        * to the created object.
-        * @param aApp Application creating this document.
-        * @return A pointer to the created instance of CQtS60MainDocument.
-        */
-        static CQtS60MainDocument* NewLC( CEikApplication& aApp );
-
-        /**
-        * ~CQtS60MainDocument
-        * Virtual Destructor.
-        */
-        virtual ~CQtS60MainDocument();
-
-    public: // Functions from base classes
-
-        /**
-        * CreateAppUiL
-        * From CEikDocument, CreateAppUiL.
-        * Create a CQtS60MainAppUi object and return a pointer to it.
-        * The object returned is owned by the Uikon framework.
-        * @return Pointer to created instance of AppUi.
-        */
-        CEikAppUi* CreateAppUiL();
-
-    private: // Constructors
-
-        /**
-        * ConstructL
-        * 2nd phase constructor.
-        */
-        void ConstructL();
-
-        /**
-        * CQtS60MainDocument.
-        * C++ default constructor.
-        * @param aApp Application creating this document.
-        */
-        CQtS60MainDocument( CEikApplication& aApp );
-
-    };
-
-#endif // __QTS60MAINDOCUMENT_H__
-
-// End of File
diff --git a/src/s60main/s60main.pro b/src/s60main/s60main.pro
index a4833aff8f..cc3c5475b5 100644
--- a/src/s60main/s60main.pro
+++ b/src/s60main/s60main.pro
@@ -14,13 +14,7 @@ symbian {
     CONFIG	-=  jpeg
     INCLUDEPATH	+=  tmp $$QMAKE_INCDIR_QT/QtCore $$MW_LAYER_SYSTEMINCLUDE
     SOURCES	 =  qts60main.cpp \
-                    qts60mainapplication.cpp \
-                    qts60mainappui.cpp \
-                    qts60maindocument.cpp
-
-    HEADERS      =  qts60mainapplication_p.h \
-                    qts60mainappui_p.h \
-                    qts60maindocument_p.h
+                    qts60main_mcrt0.cpp
 
     # This block serves the minimalistic resource file for S60 3.1 platforms.
     # Note there is no way to ifdef S60 version in mmp file, that is why the resource