diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-09 08:26:47 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-09 08:26:47 (GMT) |
| commit | cfe96b7c99cb12a666111c7861aba74d535adc89 (patch) | |
| tree | eda2c872b4446b8b4796162ea46c86a4ba171cc9 /src/gui/s60framework | |
| parent | 86eec3f6f98b387bf6a815c1a8e916965928b317 (diff) | |
| parent | 1d09376c4eec88ba94f00a4b045fc425c5f51346 (diff) | |
| download | Qt-cfe96b7c99cb12a666111c7861aba74d535adc89.zip Qt-cfe96b7c99cb12a666111c7861aba74d535adc89.tar.gz Qt-cfe96b7c99cb12a666111c7861aba74d535adc89.tar.bz2 | |
Merge remote branch 'origin/4.7' into oslo-staging-2/4.7
Conflicts:
doc/src/index.qdoc
src/dbus/qdbusconnection.cpp
src/gui/s60framework/qs60mainapplication.cpp
src/gui/s60framework/qs60mainappui.cpp
src/network/access/qnetworkrequest.cpp
src/network/bearer/qnetworkconfiguration.h
Diffstat (limited to 'src/gui/s60framework')
| -rw-r--r-- | src/gui/s60framework/qs60mainapplication.cpp | 7 | ||||
| -rw-r--r-- | src/gui/s60framework/qs60mainappui.cpp | 30 |
2 files changed, 20 insertions, 17 deletions
diff --git a/src/gui/s60framework/qs60mainapplication.cpp b/src/gui/s60framework/qs60mainapplication.cpp index 185c06f..5d4c54e 100644 --- a/src/gui/s60framework/qs60mainapplication.cpp +++ b/src/gui/s60framework/qs60mainapplication.cpp @@ -136,13 +136,16 @@ TFileName QS60MainApplication::ResourceFileName() const return KNullDesC(); } +/*! + \internal +*/ void QS60MainApplication::PreDocConstructL() { QS60MainApplicationBase::PreDocConstructL(); } /*! - \internal + \internal */ CDictionaryStore *QS60MainApplication::OpenIniFileLC(RFs &aFs) const { @@ -150,7 +153,7 @@ CDictionaryStore *QS60MainApplication::OpenIniFileLC(RFs &aFs) const } /*! - \internal + \internal */ void QS60MainApplication::NewAppServerL(CApaAppServer *&aAppServer) { diff --git a/src/gui/s60framework/qs60mainappui.cpp b/src/gui/s60framework/qs60mainappui.cpp index 72cf577..ea9dbb3 100644 --- a/src/gui/s60framework/qs60mainappui.cpp +++ b/src/gui/s60framework/qs60mainappui.cpp @@ -282,7 +282,7 @@ void QS60MainAppUi::RestoreMenuL(CCoeControl *menuWindow, TInt resourceId, TMenu } /*! - \internal + \internal */ void QS60MainAppUi::Exit() { @@ -290,7 +290,7 @@ void QS60MainAppUi::Exit() } /*! - \internal + \internal */ void QS60MainAppUi::SetFadedL(TBool aFaded) { @@ -298,7 +298,7 @@ void QS60MainAppUi::SetFadedL(TBool aFaded) } /*! - \internal + \internal */ TRect QS60MainAppUi::ApplicationRect() const { @@ -306,7 +306,7 @@ TRect QS60MainAppUi::ApplicationRect() const } /*! - \internal + \internal */ void QS60MainAppUi::HandleScreenDeviceChangedL() { @@ -314,7 +314,7 @@ void QS60MainAppUi::HandleScreenDeviceChangedL() } /*! - \internal + \internal */ void QS60MainAppUi::HandleApplicationSpecificEventL(TInt aType, const TWsEvent &aEvent) { @@ -322,7 +322,7 @@ void QS60MainAppUi::HandleApplicationSpecificEventL(TInt aType, const TWsEvent & } /*! - \internal + \internal */ TTypeUid::Ptr QS60MainAppUi::MopSupplyObject(TTypeUid aId) { @@ -330,7 +330,7 @@ TTypeUid::Ptr QS60MainAppUi::MopSupplyObject(TTypeUid aId) } /*! - \internal + \internal */ void QS60MainAppUi::ProcessCommandL(TInt aCommand) { @@ -338,7 +338,7 @@ void QS60MainAppUi::ProcessCommandL(TInt aCommand) } /*! - \internal + \internal */ TErrorHandlerResponse QS60MainAppUi::HandleError (TInt aError, const SExtendedError &aExtErr, TDes &aErrorText, TDes &aContextText) { @@ -346,7 +346,7 @@ TErrorHandlerResponse QS60MainAppUi::HandleError (TInt aError, const SExtendedEr } /*! - \internal + \internal */ void QS60MainAppUi::HandleViewDeactivation(const TVwsViewId &aViewIdToBeDeactivated, const TVwsViewId &aNewlyActivatedViewId) { @@ -354,7 +354,7 @@ void QS60MainAppUi::HandleViewDeactivation(const TVwsViewId &aViewIdToBeDeactiva } /*! - \internal + \internal */ void QS60MainAppUi::PrepareToExit() { @@ -362,7 +362,7 @@ void QS60MainAppUi::PrepareToExit() } /*! - \internal + \internal */ void QS60MainAppUi::HandleTouchPaneSizeChange() { @@ -370,7 +370,7 @@ void QS60MainAppUi::HandleTouchPaneSizeChange() } /*! - \internal + \internal */ void QS60MainAppUi::HandleSystemEventL(const TWsEvent &aEvent) { @@ -378,7 +378,7 @@ void QS60MainAppUi::HandleSystemEventL(const TWsEvent &aEvent) } /*! - \internal + \internal */ void QS60MainAppUi::Reserved_MtsmPosition() { @@ -386,7 +386,7 @@ void QS60MainAppUi::Reserved_MtsmPosition() } /*! - \internal + \internal */ void QS60MainAppUi::Reserved_MtsmObject() { @@ -394,7 +394,7 @@ void QS60MainAppUi::Reserved_MtsmObject() } /*! - \internal + \internal */ void QS60MainAppUi::HandleForegroundEventL(TBool aForeground) { |