From 3379dc4c83af3a57a4dcf9578211399c1fa7d011 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 22 Aug 2016 11:05:02 -0700 Subject: Remove obsolete mkspecs for macOS targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit macx-g++40 and macx-g++42 refer to very old versions of GCC that virtually no one should be using, and macx-llvm refers to the transitionary LLVM-GCC toolchain that is long gone from Xcode. Change-Id: Id22ea417515b257babc5ad2a60c8f1fb6d6d1956 Reviewed-by: Gabriel de Dietrich Reviewed-by: Morten Johan Sørvig --- mkspecs/macx-g++40/Info.plist.app | 22 ------------------- mkspecs/macx-g++40/Info.plist.dSYM.in | 18 --------------- mkspecs/macx-g++40/Info.plist.lib | 22 ------------------- mkspecs/macx-g++40/qmake.conf | 27 ----------------------- mkspecs/macx-g++40/qplatformdefs.h | 41 ----------------------------------- 5 files changed, 130 deletions(-) delete mode 100644 mkspecs/macx-g++40/Info.plist.app delete mode 100644 mkspecs/macx-g++40/Info.plist.dSYM.in delete mode 100644 mkspecs/macx-g++40/Info.plist.lib delete mode 100644 mkspecs/macx-g++40/qmake.conf delete mode 100644 mkspecs/macx-g++40/qplatformdefs.h (limited to 'mkspecs/macx-g++40') diff --git a/mkspecs/macx-g++40/Info.plist.app b/mkspecs/macx-g++40/Info.plist.app deleted file mode 100644 index 8e44bd7f60..0000000000 --- a/mkspecs/macx-g++40/Info.plist.app +++ /dev/null @@ -1,22 +0,0 @@ - - - - - NSPrincipalClass - NSApplication - CFBundleIconFile - @ICON@ - CFBundlePackageType - APPL - CFBundleGetInfoString - Created by Qt/QMake - CFBundleSignature - @TYPEINFO@ - CFBundleExecutable - @EXECUTABLE@ - CFBundleIdentifier - @BUNDLEIDENTIFIER@ - NOTE - This file was generated by Qt/QMake. - - diff --git a/mkspecs/macx-g++40/Info.plist.dSYM.in b/mkspecs/macx-g++40/Info.plist.dSYM.in deleted file mode 100644 index a8c8d0d4fb..0000000000 --- a/mkspecs/macx-g++40/Info.plist.dSYM.in +++ /dev/null @@ -1,18 +0,0 @@ - - - - - CFBundleIdentifier - com.apple.xcode.dsym.$${BUNDLEIDENTIFIER} - CFBundlePackageType - dSYM - CFBundleSignature - ???? -!!IF !isEmpty(VERSION) - CFBundleShortVersionString - $${VER_MAJ}.$${VER_MIN} - CFBundleVersion - $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} -!!ENDIF - - diff --git a/mkspecs/macx-g++40/Info.plist.lib b/mkspecs/macx-g++40/Info.plist.lib deleted file mode 100644 index 7cbdb9af12..0000000000 --- a/mkspecs/macx-g++40/Info.plist.lib +++ /dev/null @@ -1,22 +0,0 @@ - - - - - CFBundlePackageType - FMWK - CFBundleShortVersionString - @SHORT_VERSION@ - CFBundleVersion - @FULL_VERSION@ - CFBundleGetInfoString - Created by Qt/QMake - CFBundleSignature - @TYPEINFO@ - CFBundleExecutable - @LIBRARY@ - CFBundleIdentifier - @BUNDLEIDENTIFIER@ - NOTE - Please, do NOT change this file -- It was generated by Qt/QMake. - - diff --git a/mkspecs/macx-g++40/qmake.conf b/mkspecs/macx-g++40/qmake.conf deleted file mode 100644 index b38b0a5b61..0000000000 --- a/mkspecs/macx-g++40/qmake.conf +++ /dev/null @@ -1,27 +0,0 @@ -#macx-g++ (different from g++.conf) - -# -# qmake configuration for macx-g++ -# -# OS X + command-line compiler -# - -MAKEFILE_GENERATOR = UNIX -CONFIG += app_bundle incremental global_init_link_order lib_version_first -QMAKE_INCREMENTAL_STYLE = sublib - -QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9 - -QMAKE_CC = gcc-4.0 -QMAKE_CXX = g++-4.0 - -QMAKE_LINK = $$QMAKE_CXX -QMAKE_LINK_SHLIB = $$QMAKE_CXX -QMAKE_LINK_C = $$QMAKE_CC -QMAKE_LINK_C_SHLIB = $$QMAKE_CC - -include(../common/macx.conf) -include(../common/gcc-base-mac.conf) -include(../common/g++-macx.conf) - -load(qt_config) diff --git a/mkspecs/macx-g++40/qplatformdefs.h b/mkspecs/macx-g++40/qplatformdefs.h deleted file mode 100644 index 063491dd90..0000000000 --- a/mkspecs/macx-g++40/qplatformdefs.h +++ /dev/null @@ -1,41 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../common/mac/qplatformdefs.h" - -- cgit v1.2.3