From a0af6c8e4ac3bc45992bebe5ffe5b2daf363d862 Mon Sep 17 00:00:00 2001 From: Morten Johan Sorvig Date: Fri, 12 Oct 2012 14:13:21 +0200 Subject: Remove obsolete Mac mkspecs. Project Builder was replaced with Xcode in Mac OS 10.3. The xlc compiler is not in use on OS X any more. Change-Id: Ie9150243cf5594a70f692a6841ee8221a2fa9ddb Reviewed-by: Andy Shaw --- mkspecs/macx-pbuilder/Info.plist.app | 22 -------- mkspecs/macx-pbuilder/qmake.conf | 7 --- mkspecs/macx-pbuilder/qplatformdefs.h | 94 ----------------------------------- mkspecs/macx-xlc/qmake.conf | 83 ------------------------------- mkspecs/macx-xlc/qplatformdefs.h | 89 --------------------------------- 5 files changed, 295 deletions(-) delete mode 100755 mkspecs/macx-pbuilder/Info.plist.app delete mode 100644 mkspecs/macx-pbuilder/qmake.conf delete mode 100644 mkspecs/macx-pbuilder/qplatformdefs.h delete mode 100644 mkspecs/macx-xlc/qmake.conf delete mode 100644 mkspecs/macx-xlc/qplatformdefs.h (limited to 'mkspecs') diff --git a/mkspecs/macx-pbuilder/Info.plist.app b/mkspecs/macx-pbuilder/Info.plist.app deleted file mode 100755 index b822c2851f..0000000000 --- a/mkspecs/macx-pbuilder/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 - com.yourcompany.@EXECUTABLE@ - NOTE - This file was generated by Qt/QMake. - - diff --git a/mkspecs/macx-pbuilder/qmake.conf b/mkspecs/macx-pbuilder/qmake.conf deleted file mode 100644 index 2418c7c6f3..0000000000 --- a/mkspecs/macx-pbuilder/qmake.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# qmake configuration for macx-pbuilder -# -# Mac OS X + Project Builder -# - -error("Use macx-xcode spec") diff --git a/mkspecs/macx-pbuilder/qplatformdefs.h b/mkspecs/macx-pbuilder/qplatformdefs.h deleted file mode 100644 index b993c7673f..0000000000 --- a/mkspecs/macx-pbuilder/qplatformdefs.h +++ /dev/null @@ -1,94 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 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: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 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 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, 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. -** -** 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. -** -** -** $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 - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#include -#include -#include -#include -#include -#include -#define QT_NO_LIBRARY_UNLOAD - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifndef QT_NO_IPV6IFNAME -#include -#endif - -#include "../common/posix/qplatformdefs.h" - -#undef QT_SOCKLEN_T -#undef QT_SIGNAL_IGNORE - -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4) -#define QT_SOCKLEN_T socklen_t -#else -#define QT_SOCKLEN_T int -#endif - -#define QT_SIGNAL_IGNORE (void (*)(int))1 - -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf - -#endif // QPLATFORMDEFS_H diff --git a/mkspecs/macx-xlc/qmake.conf b/mkspecs/macx-xlc/qmake.conf deleted file mode 100644 index 4d7ab0bae2..0000000000 --- a/mkspecs/macx-xlc/qmake.conf +++ /dev/null @@ -1,83 +0,0 @@ -# -# qmake configuration for macx-xlc -# -# Mac OS X + IBM's XL C/C++ Advanced Edition for Mac OS X -# - -MAKEFILE_GENERATOR = UNIX -QMAKE_PLATFORM = mac macx -CONFIG += app_bundle global_init_link_order lib_version_first plugin_no_soname - -QMAKE_COMPILER = ibm_xlc - -QMAKE_CC = xlc -QMAKE_CC_THREAD = xlc_r -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = yacc -QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -qstrict -QMAKE_CFLAGS_WARN_ON = -QMAKE_CFLAGS_WARN_OFF = -QMAKE_CFLAGS_RELEASE = -O3 -QMAKE_CFLAGS_DEBUG = -g -QMAKE_EXTENSION_SHLIB = dylib -QMAKE_CFLAGS_SHLIB = -QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CFLAGS_YACC = -QMAKE_CFLAGS_THREAD = -qthreaded -QMAKE_EXTENSION_SHLIB = dylib -QMAKE_COMPILER_DEFINES += __APPLE__ __xlc__ - -QMAKE_CXX = xlc++ -QMAKE_CXX_THREAD = xlc++_r -QMAKE_CXXFLAGS = -+ $$QMAKE_CFLAGS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = -QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ - /System/Library/Frameworks/AGL.framework/Headers/ -QMAKE_LIBDIR_OPENGL = - -QMAKE_LINK = xlc++ -QMAKE_LINK_THREAD = xlc++_r -QMAKE_LINK_SHLIB = ld -#QMAKE_LINK_SHLIB_CMD = makeC++SharedLib -p 0 \ -# -o $(TARGETD) \ -# $(LFLAGS) $(OBJECTS) $(OBJMOC) $(LIBS); \ -# $(AR) lib$(QMAKE_TARGET).a $(TARGETD); \ -# $(RANLIB) lib$(QMAKE_TARGET).a; \ -# mv lib$(QMAKE_TARGET).a $(DESTDIR) -QMAKE_LFLAGS = -headerpad_max_install_names -QMAKE_LFLAGS_RELEASE = -QMAKE_LFLAGS_DEBUG = -QMAKE_LFLAGS_SHLIB = -prebind -qmkshrobj -QMAKE_LFLAGS_PLUGIN = -bundle -QMAKE_LFLAGS_SONAME = -#QMAKE_LFLAGS_THREAD = -L/usr/lib/threads -#QMAKE_AIX_SHLIB = 1 -#QMAKE_LFLAGS_VERSION = -current_version$${LITERAL_WHITESPACE} -#QMAKE_LFLAGS_COMPAT_VERSION = -compatibility_version$${LITERAL_WHITESPACE} - -QMAKE_LIBS = -QMAKE_LIBS_DYNLOAD = -QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL -QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL -#QMAKE_LIBS_THREAD = -lpthreads - -QMAKE_AR = ar cq -QMAKE_OBJCOPY = objcopy -QMAKE_RANLIB = ranlib -s - -include(../common/unix.conf) -load(qt_config) diff --git a/mkspecs/macx-xlc/qplatformdefs.h b/mkspecs/macx-xlc/qplatformdefs.h deleted file mode 100644 index ae65d1956d..0000000000 --- a/mkspecs/macx-xlc/qplatformdefs.h +++ /dev/null @@ -1,89 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 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: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 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 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, 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. -** -** 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. -** -** -** $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 - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#include -#include -#include -#include -#include -#include -#define QT_NO_LIBRARY_UNLOAD - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifndef QT_NO_IPV6IFNAME -#include -#endif - -#include "../common/posix/qplatformdefs.h" - -#undef QT_SOCKLEN_T -#undef QT_SIGNAL_IGNORE - -#define QT_SOCKLEN_T int -#define QT_SIGNAL_IGNORE (void (*)(int))1 - -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf - -#endif // QPLATFORMDEFS_H -- cgit v1.2.3