diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-30 08:49:01 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-30 08:49:01 (GMT) |
| commit | 9e4cefd82d3c4f67f8f182ed3956f5e92e4356e4 (patch) | |
| tree | 6f90d4434adbdb951fe67b00477e6d7b3a47f9e6 /src | |
| parent | d6b91331fe9a96c0abab72fccbcc6b5fa425a459 (diff) | |
| download | Qt-9e4cefd82d3c4f67f8f182ed3956f5e92e4356e4.zip Qt-9e4cefd82d3c4f67f8f182ed3956f5e92e4356e4.tar.gz Qt-9e4cefd82d3c4f67f8f182ed3956f5e92e4356e4.tar.bz2 | |
Revert "Compile fix for win32-icc."
This reverts commit db5e4496229a776768464d1d3d2e1f8e81bd6ba0.
Diffstat (limited to 'src')
| -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) { |