diff options
| author | mread <qt-info@nokia.com> | 2010-10-14 13:48:29 +0100 |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2010-10-14 14:00:53 +0100 |
| commit | 845aea67f6743c6bd095e68035985a31b56fb810 (patch) | |
| tree | 81f5872c2e09dbd43bafc8c3cfdf2d392744e6ea | |
| parent | 28ef9731df2b3cd865af89cc474c5fa20c24e492 (diff) | |
| download | qt4-tools-845aea67f6743c6bd095e68035985a31b56fb810.tar.gz | |
Giving Qt a default app server when Avkon is removed
Avkon provides a default app server when an app is started as a server
app. This allows any app to be started as a server app.
The Qt Avkon removal bypassed this, calling the base-class function
instead, which prevented apps from starting as server app unless they
explictly created a server.
Now Qt also creates a default app server, which implements no services,
so that any app can be started as a server app, even if Avkon is not
present. This allows Symbian^4, configured with -no-s60, to boot.
Task-number: QTBUG-14457
Reviewed-by: Jason Barron
| -rw-r--r-- | src/gui/s60framework/qs60mainapplication.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/s60framework/qs60mainapplication.cpp b/src/gui/s60framework/qs60mainapplication.cpp index 74432af626..24d2496367 100644 --- a/src/gui/s60framework/qs60mainapplication.cpp +++ b/src/gui/s60framework/qs60mainapplication.cpp @@ -47,6 +47,9 @@ #include "qs60mainapplication.h" #include <bautils.h> #include <coemain.h> +#ifndef Q_WS_S60 +# include <eikserverapp.h> +#endif QT_BEGIN_NAMESPACE @@ -152,7 +155,11 @@ CDictionaryStore *QS60MainApplication::OpenIniFileLC(RFs &aFs) const */ void QS60MainApplication::NewAppServerL(CApaAppServer *&aAppServer) { +#ifdef Q_WS_S60 QS60MainApplicationBase::NewAppServerL(aAppServer); +#else + aAppServer = new(ELeave) CEikAppServer; +#endif } QT_END_NAMESPACE |