diff options
| author | Thiago Macieira <thiago@kde.org> | 2011-07-31 17:20:09 -0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-06 19:24:23 +0100 |
| commit | c87bf2e8e63bed112456e8c5a501728fd093a4e6 (patch) | |
| tree | 70cd441be4d65483a70ae3b7a0dbdedfdefb1225 /src | |
| parent | 50e18de5161633802a88bd405b7c33cfcaaca3f7 (diff) | |
Copy qbasicatomic.h to qoldbasicatomic.h
Change-Id: I15df58f9dc29189419f8cbc0ce47bf11e9f17cf4
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/thread/qatomic.h | 2 | ||||
| -rw-r--r-- | src/corelib/thread/qoldbasicatomic.h (renamed from src/corelib/thread/qbasicatomic.h) | 0 | ||||
| -rw-r--r-- | src/corelib/thread/thread.pri | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/thread/qatomic.h b/src/corelib/thread/qatomic.h index 46026f3000..07350ecfcd 100644 --- a/src/corelib/thread/qatomic.h +++ b/src/corelib/thread/qatomic.h @@ -44,7 +44,7 @@ #ifndef QATOMIC_H #define QATOMIC_H -#include <QtCore/qbasicatomic.h> +#include <QtCore/qoldbasicatomic.h> QT_BEGIN_HEADER diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qoldbasicatomic.h index 2f952c9e0a..2f952c9e0a 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qoldbasicatomic.h diff --git a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri index d63bb914e1..974e086684 100644 --- a/src/corelib/thread/thread.pri +++ b/src/corelib/thread/thread.pri @@ -7,7 +7,8 @@ HEADERS += thread/qmutex.h \ thread/qthread.h \ thread/qthreadstorage.h \ thread/qwaitcondition.h \ - thread/qatomic.h + thread/qatomic.h \ + thread/qoldbasicatomic.h # private headers HEADERS += thread/qmutex_p.h \ @@ -40,3 +41,4 @@ unix: { else:linux-* { SOURCES += thread/qmutex_linux.cpp } else { SOURCES += thread/qmutex_unix.cpp } } + |