diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-14 13:34:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-14 13:34:07 (GMT) |
| commit | 9358d77fc1de64d2a8a06bfa4095dcde9f9b009b (patch) | |
| tree | 5679823aebd558db2f027d9a36fdfe8790c29701 | |
| parent | 235d1d687dcc2d21860cd753c9d67964c5270be2 (diff) | |
| parent | 845aea67f6743c6bd095e68035985a31b56fb810 (diff) | |
| download | Qt-9358d77fc1de64d2a8a06bfa4095dcde9f9b009b.zip Qt-9358d77fc1de64d2a8a06bfa4095dcde9f9b009b.tar.gz Qt-9358d77fc1de64d2a8a06bfa4095dcde9f9b009b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Giving Qt a default app server when Avkon is removed
| -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 74432af..24d2496 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 |