diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2012-02-02 14:23:32 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-03 08:52:42 +0100 |
commit | 0160f58d4ba5efd3beacaca3ce122554a90f1eb4 (patch) | |
tree | 8de39cce9c9cf395bcde1b42aa9ded5a724ab8f4 /src/corelib/thread/qbasicatomic.h | |
parent | a3be9bd9c4f329b1c3fe5c9c492b6279828c50d3 (diff) |
Rename qatomic_windows.h to qatomic_msvc.h
The QT_ARCH_WINDOWS(CE) define(s) aren't used to control which
header to include anymore, so just remove it. We also do not need
the empty src/corelib/arch/windows/arch.pri.
Change-Id: I5400fc852af31907e533d0278540b8cd3da391cb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/thread/qbasicatomic.h')
-rw-r--r-- | src/corelib/thread/qbasicatomic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index 44f536724c..0da4dcb265 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -46,8 +46,8 @@ #if defined(QT_MOC) || defined(QT_BUILD_QMAKE) || defined(QT_RCC) || defined(QT_UIC) || defined(QT_BOOTSTRAPPED) # include <QtCore/qatomic_bootstrap.h> -#elif defined(Q_OS_WIN) && defined(Q_CC_MSVC) -# include <QtCore/qatomic_windows.h> +#elif defined(Q_CC_MSVC) +# include <QtCore/qatomic_msvc.h> #elif defined(__arm__) || defined(__TARGET_ARCH_ARM) # include <QtCore/qatomic_arm.h> #elif defined(__i386) || defined(__i386__) |