--- a/src/gui/util/qdesktopservices_s60.cpp	Tue Jan 26 12:42:25 2010 +0200
+++ b/src/gui/util/qdesktopservices_s60.cpp	Tue Feb 02 00:43:10 2010 +0200
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtGui of the Qt Toolkit.
+** This file is part of the QtGui module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -41,7 +41,7 @@
 
 // This flag changes the implementation to use S60 CDcoumentHandler
 // instead of apparch when opening the files
-#undef USE_DOCUMENTHANDLER
+#define USE_DOCUMENTHANDLER
 
 #include <qcoreapplication.h>
 #include <qdir.h>
@@ -64,12 +64,14 @@
 #include <rsendasmessage.h>         // RSendAsMessage
 
 #ifdef Q_WS_S60
-#  include <pathinfo.h>               // PathInfo
+#  include <pathinfo.h>             // PathInfo
 #  ifdef USE_DOCUMENTHANDLER
-#    include <documenthandler.h>        // CDocumentHandler
+#    include <documenthandler.h>    // CDocumentHandler
+#    include <aknserverapp.h>
 #  endif
-#elif defined(USE_DOCUMENTHANDLER)
-#  error CDocumentHandler requires support for S60
+#else
+#  warning CDocumentHandler requires support for S60
+#  undef USE_DOCUMENTHANDLER        // Fallback to RApaLsSession based implementation
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -101,6 +103,42 @@
     R* mPtr;
 };
 
+#ifdef USE_DOCUMENTHANDLER
+class QS60DocumentHandler : public MAknServerAppExitObserver
+{
+public:
+    QS60DocumentHandler() :docHandler(0) {}
+
+    ~QS60DocumentHandler() {
+        delete docHandler;
+    }
+
+    CDocumentHandler& documentHandler() {
+        // In case user calls openUrl twice subsequently, before the first embedded app is closed
+        // we use the same CDocumentHandler instance. Using same instance makes sure the first
+        // launched embedded app is closed and latter one gets embedded to our app.
+        // Using different instance would help only theoretically since user cannot interact with
+        // several embedded apps at the same time.
+        if(!docHandler) {
+            QT_TRAP_THROWING(docHandler = CDocumentHandler::NewL());
+            docHandler->SetExitObserver(this);
+        }
+        return *docHandler;
+    }
+
+private: // From MAknServerAppExitObserver
+    void HandleServerAppExit(TInt /*aReason*/) {
+        delete docHandler;
+        docHandler = 0;
+    }
+
+private:
+    CDocumentHandler* docHandler;
+};
+Q_GLOBAL_STATIC(QS60DocumentHandler, qt_s60_documenthandler);
+#endif
+
+
 static void handleMailtoSchemeLX(const QUrl &url)
 {
     // this function has many intermingled leaves and throws. Qt and Symbian objects do not have
@@ -270,21 +308,9 @@
     CleanupStack::PopAndDestroy(); // appArcSession
 #else
     // This is an alternative way to launch app associated to MIME type
-    // CDocumentHandler would support opening apps in embedded mode,
-    // but our Qt application window group seems to always get switched on top of embedded one
-    // -> Cannot use menus etc of embedded app -> used
-
-    CDocumentHandler* docHandler = CDocumentHandler::NewLC();
+    // CDocumentHandler also supports opening apps in embedded mode.
     TDataType temp;
-    //Standalone file opening fails for some file-types at least in S60 3.1 emulator
-    //For example .txt file fails with KErrAlreadyInUse and music files with KERN-EXEC 0
-    //Workaround is to use OpenFileEmbeddedL
-    //docHandler->OpenFileL(aUrl, temp);
-
-    // Opening file with CDocumentHandler will leave if file does not exist
-    // Leave is trapped in openDocument and false returned to user.
-    docHandler->OpenFileEmbeddedL(aUrl, temp);
-    CleanupStack::PopAndDestroy(docHandler);
+    qt_s60_documenthandler()->documentHandler().OpenFileEmbeddedL(aUrl, temp);
 #endif
 }
 
@@ -355,7 +381,7 @@
     case DesktopLocation:
         qWarning("No desktop concept in Symbian OS");
         // But lets still use some feasible default
-        path.Append(writableDataRoot());           
+        path.Append(writableDataRoot());
         break;
     case DocumentsLocation:
         path.Append(writableDataRoot());
@@ -386,7 +412,7 @@
 #endif
         break;
     case TempLocation:
-        return QDir::tempPath(); 
+        return QDir::tempPath();
         break;
     case HomeLocation:
         path.Append(writableDataRoot());
@@ -400,10 +426,10 @@
         CEikonEnv::Static()->FsSession().PrivatePath(path);
         path.Insert(0, writableExeDrive().Name());
         path.Append(KCacheSubDir);
-        break;        
+        break;
     default:
         // Lets use feasible default
-        path.Append(writableDataRoot());    
+        path.Append(writableDataRoot());
         break;
     }