diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-28 15:31:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-28 15:31:56 (GMT) |
| commit | cf5695691682957b68b67fd951addf4a52bfba84 (patch) | |
| tree | 62cda7692178090b28aec0ef398622a83314945e /src/corelib | |
| parent | 80f4706ced041a980551c78a4b796c646f9b93b4 (diff) | |
| parent | f6f118b9e45b61c8dab8af976c9a4c4493e73b5f (diff) | |
| download | Qt-cf5695691682957b68b67fd951addf4a52bfba84.zip Qt-cf5695691682957b68b67fd951addf4a52bfba84.tar.gz Qt-cf5695691682957b68b67fd951addf4a52bfba84.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Symbian configuration parameter change for linux building
Improve patch_capabilities script output.
Fix QtSql autotest server addresses
Update SQLite version number in legal document
Update SQLite version mentioned in licence document
Symbian Linuxification building case changes
Fix FTP example to handle failure to open network session
Use QBasicAtomicInt as a static variable
FTP - fix interoperability issues with SIZE command
QS60StyleAnimation exception safety
Catch potential throw in ~QSymbianControl
Fixed access to null threadData in ~QObjectPrivate
Fix the build for makefile build system of Symbian
Symbian - fix compile error when default configured
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 5d6e4d7..1f716bc 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -163,14 +163,15 @@ QObjectPrivate::~QObjectPrivate() { if (pendTimer) { // unregister pending timers - if (threadData->eventDispatcher) + if (threadData && threadData->eventDispatcher) threadData->eventDispatcher->unregisterTimers(q_ptr); } if (postedEvents) QCoreApplication::removePostedEvents(q_ptr, 0); - threadData->deref(); + if (threadData) + threadData->deref(); delete static_cast<QAbstractDynamicMetaObject*>(metaObject); #ifdef QT_JAMBI_BUILD |