From 68e5fd9ebc8a3f510e3144e981a0cb358945fb9c Mon Sep 17 00:00:00 2001 From: "Bradley T. Hughes" Date: Wed, 25 Jan 2012 16:12:53 +0100 Subject: Remove the 'macosx' arch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The new atomic implementation chooses which header to include based on what #define's are set by the compiler (i.e. __x86_64__ or __i386__). Because of this, the qatomic_macosx.h header isn't used anymore. This also means that the configure script does not need to use or look for this file anymore, it should just use the normal uname -m detection. Change-Id: Ibf275488735483268286196952299c0e496dfd1f Reviewed-by: Morten Johan Sørvig Reviewed-by: Oswald Buddenhagen --- src/corelib/arch/qatomic_macosx.h | 57 --------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 src/corelib/arch/qatomic_macosx.h (limited to 'src/corelib/arch/qatomic_macosx.h') diff --git a/src/corelib/arch/qatomic_macosx.h b/src/corelib/arch/qatomic_macosx.h deleted file mode 100644 index a839aed4bf..0000000000 --- a/src/corelib/arch/qatomic_macosx.h +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** 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 QATOMIC_MACOSX_H -#define QATOMIC_MACOSX_H - -QT_BEGIN_HEADER - -#if defined(__x86_64__) -# include -#elif defined(__i386__) -# include -#else // !__x86_64 && !__i386__ -# include -#endif // !__x86_64__ && !__i386__ - -QT_END_HEADER - -#endif // QATOMIC_MACOSX_H -- cgit v1.2.3