diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-15 12:24:51 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-15 12:24:51 (GMT) |
| commit | 4f46562b01cc068cd940281f71061386d7f4ecc3 (patch) | |
| tree | 523fa14f5f8b5c3a66464494425661be6f2c5d99 /src/gui | |
| parent | 1637d135906296b2a32f17ed20c86869dc1667e8 (diff) | |
| parent | e7b372e4705451dfd4443db7e6fc64d4b8f30c68 (diff) | |
| download | Qt-4f46562b01cc068cd940281f71061386d7f4ecc3.zip Qt-4f46562b01cc068cd940281f71061386d7f4ecc3.tar.gz Qt-4f46562b01cc068cd940281f71061386d7f4ecc3.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/gui')
| -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 |