diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-24 20:20:56 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-24 20:20:56 (GMT) |
| commit | e4002434bfde5c8206463ea3a0d4140835619944 (patch) | |
| tree | f199a1e233867ab4e85d22aa138391585af75fca /src/corelib/kernel | |
| parent | 3f183debfd677b952b015f6950131dd25bd4768b (diff) | |
| parent | 5a7c14af3c27089b0b8698da3c689637ffaa9cfa (diff) | |
| download | Qt-e4002434bfde5c8206463ea3a0d4140835619944.zip Qt-e4002434bfde5c8206463ea3a0d4140835619944.tar.gz Qt-e4002434bfde5c8206463ea3a0d4140835619944.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcore_symbian_p.h | 6 | ||||
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_symbian.cpp | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcore_symbian_p.h b/src/corelib/kernel/qcore_symbian_p.h index 2a81b99..fab7254 100644 --- a/src/corelib/kernel/qcore_symbian_p.h +++ b/src/corelib/kernel/qcore_symbian_p.h @@ -94,6 +94,12 @@ static inline TPtrC qt_QString2TPtrC( const QString& string ) return TPtrC16(static_cast<const TUint16*>(string.utf16()), string.length()); } +/*! + \internal + This class is a wrapper around the Symbian HBufC descriptor class. + It makes sure that the heap allocated HBufC class is freed when it is + destroyed. +*/ class Q_CORE_EXPORT QHBufC { public: diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp index 881e546..daeb0e1 100644 --- a/src/corelib/kernel/qeventdispatcher_symbian.cpp +++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp @@ -238,7 +238,6 @@ void QTimerActiveObject::Run() if (m_timerInfo->interval > 0) { // Start a new timer immediately so that we don't lose time. - iStatus = KRequestPending; SetActive(); m_rTimer.After(iStatus, m_timerInfo->interval*1000); |