From d16f76cde3a78287b565215e6d6906f54616b756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Hunold?= Date: Thu, 9 Oct 2014 08:40:18 +0200 Subject: Remove duplicate of clang + libc++ mkspec The same funcionality is already supported, so we avoid confusion. The corresponding mkspec is name "linux-clang-libc++" Change-Id: Ib087595298b48c73ad5da8d92cca2d1bac89f2be Reviewed-by: Joerg Bornemann --- mkspecs/unsupported/linux-libc++-clang/qmake.conf | 20 ----- .../unsupported/linux-libc++-clang/qplatformdefs.h | 92 ---------------------- 2 files changed, 112 deletions(-) delete mode 100644 mkspecs/unsupported/linux-libc++-clang/qmake.conf delete mode 100644 mkspecs/unsupported/linux-libc++-clang/qplatformdefs.h diff --git a/mkspecs/unsupported/linux-libc++-clang/qmake.conf b/mkspecs/unsupported/linux-libc++-clang/qmake.conf deleted file mode 100644 index bf0abb2a54..0000000000 --- a/mkspecs/unsupported/linux-libc++-clang/qmake.conf +++ /dev/null @@ -1,20 +0,0 @@ -# -# qmake configuration for linux-clang -# - -MAKEFILE_GENERATOR = UNIX -CONFIG += incremental - -QMAKE_INCREMENTAL_STYLE = sublib - -include(../../common/linux.conf) -include(../../common/gcc-base-unix.conf) -include(../../common/clang.conf) - -QMAKE_CFLAGS_RELEASE = -Os -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE - -QMAKE_CXXFLAGS_CXX11 += -std=c++11 -stdlib=libc++ -QMAKE_LFLAGS_CXX11 += -stdlib=libc++ -lc++abi - -load(qt_config) diff --git a/mkspecs/unsupported/linux-libc++-clang/qplatformdefs.h b/mkspecs/unsupported/linux-libc++-clang/qplatformdefs.h deleted file mode 100644 index 0f0c60b148..0000000000 --- a/mkspecs/unsupported/linux-libc++-clang/qplatformdefs.h +++ /dev/null @@ -1,92 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QPLATFORMDEFS_H -#define QPLATFORMDEFS_H - -// Get Qt defines/settings - -#include "qglobal.h" - -// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs - -// 1) need to reset default environment if _BSD_SOURCE is defined -// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0 -// 3) it seems older glibc need this to include the X/Open stuff -#ifndef _GNU_SOURCE -# define _GNU_SOURCE -#endif - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifndef QT_NO_IPV6IFNAME -#include -#endif - -#define QT_USE_XOPEN_LFS_EXTENSIONS -#include "../../common/posix/qplatformdefs.h" - -#undef QT_SOCKLEN_T - -#if defined(__GLIBC__) && (__GLIBC__ >= 2) -#define QT_SOCKLEN_T socklen_t -#else -#define QT_SOCKLEN_T int -#endif - -#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf -#endif - -#endif // QPLATFORMDEFS_H -- cgit v1.2.3