diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-25 14:31:00 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-25 14:31:00 (GMT) |
| commit | 3e36b311710009039e8ffdfa46702e012f25785b (patch) | |
| tree | e02a30a76a9e036bdc4fe85f35ba946d1a7d5389 /src/corelib/tools | |
| parent | 9d8f5dcb46f64ee2f5e205100b603f6d01f1381b (diff) | |
| parent | 4b9784fcdd7321a5d82b8ae73edd1ae52786d7ad (diff) | |
| download | Qt-3e36b311710009039e8ffdfa46702e012f25785b.zip Qt-3e36b311710009039e8ffdfa46702e012f25785b.tar.gz Qt-3e36b311710009039e8ffdfa46702e012f25785b.tar.bz2 | |
Merge branch '4.5'
Conflicts:
src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 6 | ||||
| -rw-r--r-- | src/corelib/tools/tools.pri | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 928805a..0471a1b 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -48,6 +48,8 @@ #pragma qt_sync_stop_processing #endif +#include <QtCore/qatomic.h> + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -138,14 +140,14 @@ namespace QtSharedPointer { inline void internalConstruct(T *ptr) { -#ifndef QT_NO_DEBUG +#ifdef QT_SHAREDPOINTER_TRACK_POINTERS if (ptr) internalSafetyCheckAdd(ptr); #endif value = ptr; } inline void internalDestroy() { -#ifndef QT_NO_DEBUG +#ifdef QT_SHAREDPOINTER_TRACK_POINTERS if (value) internalSafetyCheckRemove(value); #endif } diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index aea0c6c..c93a065 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -28,6 +28,8 @@ HEADERS += \ tools/qregexp.h \ tools/qringbuffer_p.h \ tools/qshareddata.h \ + tools/qsharedpointer.h \ + tools/qsharedpointer_impl.h \ tools/qset.h \ tools/qsize.h \ tools/qstack.h \ |