diff options
| author | Bill King <bill.king@nokia.com> | 2009-12-09 23:07:52 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-12-09 23:07:52 (GMT) |
| commit | e032c0756df0d11f7a43bcdfbb82cf2d83fe74a4 (patch) | |
| tree | 36884ee5c9a9287663c05d5db529a3a0f16b9550 /src/corelib/kernel/qobject.cpp | |
| parent | 127d52df97b68fcf54a50e471a0b899d92fda10a (diff) | |
| parent | 346d3618bad19714b41ad45715cdef9488ce8969 (diff) | |
| download | Qt-e032c0756df0d11f7a43bcdfbb82cf2d83fe74a4.zip Qt-e032c0756df0d11f7a43bcdfbb82cf2d83fe74a4.tar.gz Qt-e032c0756df0d11f7a43bcdfbb82cf2d83fe74a4.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, 0 insertions, 12 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 4321c59..30cd011 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -153,15 +153,6 @@ 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); @@ -173,9 +164,6 @@ QObjectPrivate::~QObjectPrivate() delete extraData; #endif } -#ifdef Q_CC_INTEL -# pragma auto_inline(on) -#endif int *QObjectPrivate::setDeleteWatch(QObjectPrivate *d, int *w) { |