diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-24 07:51:22 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-24 07:51:22 (GMT) |
| commit | 52922773b5d2c55ce5edee9253c0badfc2001d2c (patch) | |
| tree | 32c00b0d0ac82c3b010763b5284dd505dd83d73a /src/corelib/kernel/qobject.cpp | |
| parent | cf89e30f6885efb4b63f01e4459f8b277cb52113 (diff) | |
| parent | 25fd8e7a48f4cc2bd3a5d52ac8f90a6691d65c05 (diff) | |
| download | Qt-52922773b5d2c55ce5edee9253c0badfc2001d2c.zip Qt-52922773b5d2c55ce5edee9253c0badfc2001d2c.tar.gz Qt-52922773b5d2c55ce5edee9253c0badfc2001d2c.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 1260d47..95602d9 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -154,6 +154,15 @@ QObjectPrivate::QObjectPrivate(int version) hasGuards = false; } +#ifdef Q_CC_INTEL +/* Workaround for a bug in win32-icc where it seems to inline ~QObjectPrivate too aggressive. + When icc compiles QtGui, it inlines ~QObjectPrivate so that it would generate a call to + ~QObjectData. However, ~QObjectData is not exported from QtCore, so it does not link. + See also QTBUG-5145 for info on how this manifested itself. + */ +# pragma auto_inline(off) +#endif + QObjectPrivate::~QObjectPrivate() { delete static_cast<QAbstractDynamicMetaObject*>(metaObject); @@ -165,6 +174,9 @@ QObjectPrivate::~QObjectPrivate() delete extraData; #endif } +#ifdef Q_CC_INTEL +# pragma auto_inline(on) +#endif int *QObjectPrivate::setDeleteWatch(QObjectPrivate *d, int *w) { |