diff options
author | Samuli Piippo <samuli.piippo@digia.com> | 2012-03-01 13:53:34 (GMT) |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-06 23:42:38 (GMT) |
commit | 093929e29f22f116584fc36ccb5d545799c2871a (patch) | |
tree | 2da2b93a74ccc79cea2da89732f9f47a30124e5b /mkspecs/unsupported | |
parent | 0324bb17f7cb0e855ca1d7adb2d0e171b19dfd06 (diff) | |
download | Qt-093929e29f22f116584fc36ccb5d545799c2871a.zip Qt-093929e29f22f116584fc36ccb5d545799c2871a.tar.gz Qt-093929e29f22f116584fc36ccb5d545799c2871a.tar.bz2 |
Move qws/qnx-* mkspec files from unsupported
As QNX in now a supported platform, move mkspec files
away from unsupported folder.
Change-Id: I31f806b5d5217cfb0420dc74dc7a5eea33c1598d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/unsupported')
-rw-r--r-- | mkspecs/unsupported/qws/qnx-arm-g++/qmake.conf | 32 | ||||
-rw-r--r-- | mkspecs/unsupported/qws/qnx-arm-g++/qplatformdefs.h | 42 | ||||
-rw-r--r-- | mkspecs/unsupported/qws/qnx-armv7-g++/qmake.conf | 32 | ||||
-rw-r--r-- | mkspecs/unsupported/qws/qnx-armv7-g++/qplatformdefs.h | 42 | ||||
-rw-r--r-- | mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf | 24 | ||||
-rw-r--r-- | mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h | 42 | ||||
-rw-r--r-- | mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf | 24 | ||||
-rw-r--r-- | mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h | 42 | ||||
-rw-r--r-- | mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf | 24 | ||||
-rw-r--r-- | mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h | 42 |
10 files changed, 0 insertions, 346 deletions
diff --git a/mkspecs/unsupported/qws/qnx-arm-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-arm-g++/qmake.conf deleted file mode 100644 index b9f946e..0000000 --- a/mkspecs/unsupported/qws/qnx-arm-g++/qmake.conf +++ /dev/null @@ -1,32 +0,0 @@ -# -# qmake configuration for qnx-arm-g++ -# -# Written for QNX RTOS v6 -# - -include(../../../common/qnx/qmake.conf) - -# modifications to gcc-base.conf and g++-base.conf - -#Bug in arm compiler for QNX -QMAKE_CFLAGS_RELEASE = -O1 -QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = -O1 -g - -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO - -QMAKE_CC = ntoarm-gcc -QMAKE_CXX = ntoarm-g++ - -QMAKE_LINK = ntoarm-g++ -QMAKE_LINK_SHLIB = $$QMAKE_LINK -QMAKE_LINK_C = ntoarm-gcc -QMAKE_LINK_C_SHLIB = $$QMAKE_LINK_C - -# modifications to linux.conf -QMAKE_AR = ntoarm-ar cqs -QMAKE_STRIP = ntoarm-strip -QMAKE_RANLIB = ntoarm-ranlib -QMAKE_OBJCOPY = ntoarm-objcopy - -load(qt_config) diff --git a/mkspecs/unsupported/qws/qnx-arm-g++/qplatformdefs.h b/mkspecs/unsupported/qws/qnx-arm-g++/qplatformdefs.h deleted file mode 100644 index 1f5dadd..0000000 --- a/mkspecs/unsupported/qws/qnx-arm-g++/qplatformdefs.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the qmake spec 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$ -** -****************************************************************************/ - -#include "../../../common/qnx/qplatformdefs.h" diff --git a/mkspecs/unsupported/qws/qnx-armv7-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-armv7-g++/qmake.conf deleted file mode 100644 index c6763d5..0000000 --- a/mkspecs/unsupported/qws/qnx-armv7-g++/qmake.conf +++ /dev/null @@ -1,32 +0,0 @@ -# -# qmake configuration for qnx-armv7-g++ -# -# Written for QNX RTOS v6 -# - -include(../../../common/qnx/qmake.conf) - -# modifications to gcc-base.conf and g++-base.conf - -# note: on the NVidia Tegra 2 and on the Marvell Dovecott, '-mfpu=neon' should be removed -QMAKE_CFLAGS_RELEASE = -O3 -march=armv7-a -mfpu=neon -mfloat-abi=softfp -QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO = -O3 -g -march=armv7-a -mfpu=neon -mfloat-abi=softfp - -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO - -QMAKE_CC = ntoarmv7-gcc -QMAKE_CXX = ntoarmv7-g++ - -QMAKE_LINK = ntoarmv7-g++ -QMAKE_LINK_SHLIB = $$QMAKE_LINK -QMAKE_LINK_C = ntoarmv7-gcc -QMAKE_LINK_C_SHLIB = $$QMAKE_LINK_C - -# modifications to linux.conf -QMAKE_AR = ntoarmv7-ar cqs -QMAKE_STRIP = ntoarmv7-strip -QMAKE_RANLIB = ntoarmv7-ranlib -QMAKE_OBJCOPY = ntoarmv7-objcopy - -load(qt_config) diff --git a/mkspecs/unsupported/qws/qnx-armv7-g++/qplatformdefs.h b/mkspecs/unsupported/qws/qnx-armv7-g++/qplatformdefs.h deleted file mode 100644 index 1f5dadd..0000000 --- a/mkspecs/unsupported/qws/qnx-armv7-g++/qplatformdefs.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the qmake spec 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$ -** -****************************************************************************/ - -#include "../../../common/qnx/qplatformdefs.h" diff --git a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf deleted file mode 100644 index f5e7045..0000000 --- a/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf +++ /dev/null @@ -1,24 +0,0 @@ -# -# qmake configuration for qnx-generic-g++ -# -# Written for QNX RTOS v6 -# - -include(../../../common/qnx/qmake.conf) - -# derived from g++-base.conf -#QMAKE_CC = gcc -#QMAKE_CXX = g++ - -#QMAKE_LINK = g++ -#QMAKE_LINK_SHLIB = g++ -#QMAKE_LINK_C = gcc -#QMAKE_LINK_C_SHLIB = gcc - -# derived from linux.conf -#QMAKE_AR = ar cqs -#QMAKE_OBJCOPY = objcopy -#QMAKE_RANLIB = -#QMAKE_STRIP = strip - -load(qt_config) diff --git a/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h b/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h deleted file mode 100644 index 1f5dadd..0000000 --- a/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the qmake spec 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$ -** -****************************************************************************/ - -#include "../../../common/qnx/qplatformdefs.h" diff --git a/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf deleted file mode 100644 index 6940bd8..0000000 --- a/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf +++ /dev/null @@ -1,24 +0,0 @@ -# -# qmake configuration for qnx-i386-g++ -# -# Written for QNX RTOS v6 -# - -include(../../../common/qnx/qmake.conf) - -# modifications to g++-base.conf -QMAKE_CC = ntox86-gcc -QMAKE_CXX = ntox86-g++ - -QMAKE_LINK = ntox86-g++ -QMAKE_LINK_SHLIB = $$QMAKE_LINK -QMAKE_LINK_C = ntox86-gcc -QMAKE_LINK_C_SHLIB = $$QMAKE_LINK_C - -# modifications to linux.conf -QMAKE_AR = ntox86-ar cqs -QMAKE_OBJCOPY = ntox86-objcopy -QMAKE_RANLIB = ntox86-ranlib -QMAKE_STRIP = ntox86-strip - -load(qt_config) diff --git a/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h b/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h deleted file mode 100644 index 1f5dadd..0000000 --- a/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the qmake spec 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$ -** -****************************************************************************/ - -#include "../../../common/qnx/qplatformdefs.h" diff --git a/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf b/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf deleted file mode 100644 index cb4d391..0000000 --- a/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf +++ /dev/null @@ -1,24 +0,0 @@ -# -# qmake configuration for qnx-ppc-g++ -# -# Written for QNX RTOS v6 -# - -include(../../../common/qnx/qmake.conf) - -# modifications to g++-base.conf -QMAKE_CC = ntoppc-gcc -QMAKE_CXX = ntoppc-g++ - -QMAKE_LINK = ntoppc-g++ -QMAKE_LINK_SHLIB = $$QMAKE_LINK -QMAKE_LINK_C = ntoppc-gcc -QMAKE_LINK_C_SHLIB = $$QMAKE_LINK_C - -# modifications to linux.conf -QMAKE_AR = ntoppc-ar cqs -QMAKE_STRIP = ntoppc-strip -QMAKE_RANLIB = ntoppc-ranlib -QMAKE_OBJCOPY = ntoppc-objcopy - -load(qt_config) diff --git a/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h b/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h deleted file mode 100644 index 1f5dadd..0000000 --- a/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the qmake spec 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$ -** -****************************************************************************/ - -#include "../../../common/qnx/qplatformdefs.h" |