diff options
-rw-r--r-- | src/corelib/arch/arch.pri | 8 | ||||
-rw-r--r-- | src/corelib/arch/qatomic_arch.h | 4 | ||||
-rw-r--r-- | src/corelib/arch/qatomic_msvc.h (renamed from src/corelib/arch/qatomic_windows.h) | 10 | ||||
-rw-r--r-- | src/corelib/arch/qatomic_windowsce.h | 56 | ||||
-rw-r--r-- | src/corelib/arch/windows/arch.pri | 3 | ||||
-rw-r--r-- | src/corelib/thread/qbasicatomic.h | 4 |
6 files changed, 9 insertions, 76 deletions
diff --git a/src/corelib/arch/arch.pri b/src/corelib/arch/arch.pri index c40b383622..cd504b1d75 100644 --- a/src/corelib/arch/arch.pri +++ b/src/corelib/arch/arch.pri @@ -1,4 +1,4 @@ -win32:HEADERS += arch/qatomic_windows.h \ +win32:HEADERS += arch/qatomic_msvc.h \ arch/qatomic_generic.h win32-g++*:HEADERS += arch/qatomic_i386.h \ @@ -35,7 +35,7 @@ integrity:HEADERS += arch/qatomic_integrity.h arch/qatomic_cxx11.h QT_ARCH_CPP = $$QT_SOURCE_TREE/src/corelib/arch/$$QT_ARCH -DEPENDPATH += $$QT_ARCH_CPP -!isEmpty(QT_ARCH) { - include($$QT_ARCH_CPP/arch.pri, "", true) +exists($$QT_ARCH_CPP) { + DEPENDPATH += $$QT_ARCH_CPP + include($$QT_ARCH_CPP/arch.pri, "", true) } diff --git a/src/corelib/arch/qatomic_arch.h b/src/corelib/arch/qatomic_arch.h index 5e851b2c07..5c18051461 100644 --- a/src/corelib/arch/qatomic_arch.h +++ b/src/corelib/arch/qatomic_arch.h @@ -68,10 +68,6 @@ QT_BEGIN_HEADER # include "QtCore/qatomic_s390.h" #elif defined(QT_ARCH_SPARC) # include "QtCore/qatomic_sparc.h" -#elif defined(QT_ARCH_WINDOWS) -# include "QtCore/qatomic_windows.h" -#elif defined(QT_ARCH_WINDOWSCE) -# include "QtCore/qatomic_windowsce.h" #elif defined(QT_ARCH_SH) # include "QtCore/qatomic_sh.h" #elif defined(QT_ARCH_SH4A) diff --git a/src/corelib/arch/qatomic_windows.h b/src/corelib/arch/qatomic_msvc.h index caac54b0e4..eeb37dba89 100644 --- a/src/corelib/arch/qatomic_windows.h +++ b/src/corelib/arch/qatomic_msvc.h @@ -39,10 +39,8 @@ ** ****************************************************************************/ -#ifndef QATOMIC_WINDOWS_H -#define QATOMIC_WINDOWS_H - -#ifdef Q_CC_MSVC +#ifndef QATOMIC_MSVC_H +#define QATOMIC_MSVC_H #include <QtCore/qgenericatomic.h> @@ -380,6 +378,4 @@ inline T *QAtomicOps<T *>::fetchAndAddRelaxed(T *&_q_value, qptrdiff valueToAdd) QT_END_NAMESPACE QT_END_HEADER -#endif // Q_CC_MSVC - -#endif // QATOMIC_WINDOWS_H +#endif // QATOMIC_MSVC_H diff --git a/src/corelib/arch/qatomic_windowsce.h b/src/corelib/arch/qatomic_windowsce.h deleted file mode 100644 index cce155e523..0000000000 --- a/src/corelib/arch/qatomic_windowsce.h +++ /dev/null @@ -1,56 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef WINDOWSCE_QATOMIC_H -#define WINDOWSCE_QATOMIC_H - -#include <QtCore/qglobal.h> -QT_BEGIN_HEADER - -#if defined(QT_ARCH_WINDOWSCE) -#include "QtCore/qatomic_windows.h" -#endif - -QT_END_HEADER - -#endif // QATOMIC_ARCH_H - - diff --git a/src/corelib/arch/windows/arch.pri b/src/corelib/arch/windows/arch.pri deleted file mode 100644 index d42374b98f..0000000000 --- a/src/corelib/arch/windows/arch.pri +++ /dev/null @@ -1,3 +0,0 @@ -# -# Windows architecture -# 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__) |