AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename qatomic_windows.h to qatomic_msvc.h

Browse Source 
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>
This commit is contained in:
Bradley T. Hughes 2012-02-02 14:23:32 +01:00 committed by Qt by Nokia
parent a3be9bd9c4
commit 0160f58d4b
6 changed files with 9 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/arch/arch.pri
View File

@ -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)
}

4
src/corelib/arch/qatomic_arch.h
View File

@ -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)

10
src/corelib/arch/qatomic_windows.h → src/corelib/arch/qatomic_msvc.h
View File

@ -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

56
src/corelib/arch/qatomic_windowsce.h
View File

@ -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

3
src/corelib/arch/windows/arch.pri
View File

@ -1,3 +0,0 @@
#
# Windows architecture
#

4
src/corelib/thread/qbasicatomic.h
View File

@ -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__)