From 341b813c75d0529f9220e4a10e804d3a7cfca6af Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Wed, 5 Sep 2012 09:40:37 +0100 Subject: QNX: Move qpa-based mkspecs out of the unsupported directory RIM is committed to supporting Qt on its platforms and the port works well. Backport of commit 219ba05b2a43e40feeb2bdebbf53d6da55f2dba2 Change-Id: If34940018036685c6b8dbda193c97b8c50eef1dd Reviewed-by: Kevin Krammer Reviewed-by: Nicolas Arnaud-Cormos Reviewed-by: Thomas McGuire Reviewed-by: Andreas Holzammer Reviewed-by: Oswald Buddenhagen --- mkspecs/blackberry-armv7le-qcc/qmake.conf | 12 +++ mkspecs/blackberry-armv7le-qcc/qplatformdefs.h | 44 +++++++++ mkspecs/blackberry-x86-qcc/qmake.conf | 12 +++ mkspecs/blackberry-x86-qcc/qplatformdefs.h | 44 +++++++++ mkspecs/qnx-armv7le-qcc/qmake.conf | 26 ++++++ mkspecs/qnx-armv7le-qcc/qplatformdefs.h | 104 +++++++++++++++++++++ mkspecs/qnx-x86-qcc/qmake.conf | 26 ++++++ mkspecs/qnx-x86-qcc/qplatformdefs.h | 104 +++++++++++++++++++++ .../unsupported/blackberry-armv7le-qcc/qmake.conf | 12 --- .../blackberry-armv7le-qcc/qplatformdefs.h | 44 --------- mkspecs/unsupported/blackberry-x86-qcc/qmake.conf | 12 --- .../unsupported/blackberry-x86-qcc/qplatformdefs.h | 44 --------- mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf | 26 ------ .../unsupported/qnx-armv7le-qcc/qplatformdefs.h | 104 --------------------- mkspecs/unsupported/qnx-x86-qcc/qmake.conf | 26 ------ mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h | 104 --------------------- 16 files changed, 372 insertions(+), 372 deletions(-) create mode 100644 mkspecs/blackberry-armv7le-qcc/qmake.conf create mode 100644 mkspecs/blackberry-armv7le-qcc/qplatformdefs.h create mode 100644 mkspecs/blackberry-x86-qcc/qmake.conf create mode 100644 mkspecs/blackberry-x86-qcc/qplatformdefs.h create mode 100644 mkspecs/qnx-armv7le-qcc/qmake.conf create mode 100644 mkspecs/qnx-armv7le-qcc/qplatformdefs.h create mode 100644 mkspecs/qnx-x86-qcc/qmake.conf create mode 100644 mkspecs/qnx-x86-qcc/qplatformdefs.h delete mode 100644 mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf delete mode 100644 mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h delete mode 100644 mkspecs/unsupported/blackberry-x86-qcc/qmake.conf delete mode 100644 mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h delete mode 100644 mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf delete mode 100644 mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h delete mode 100644 mkspecs/unsupported/qnx-x86-qcc/qmake.conf delete mode 100644 mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h diff --git a/mkspecs/blackberry-armv7le-qcc/qmake.conf b/mkspecs/blackberry-armv7le-qcc/qmake.conf new file mode 100644 index 0000000000..4e72667c5d --- /dev/null +++ b/mkspecs/blackberry-armv7le-qcc/qmake.conf @@ -0,0 +1,12 @@ +# +# qmake configuration for blackberry x86 systems +# + +DEFINES += Q_OS_BLACKBERRY +CONFIG += blackberry +LIBS += -lbps + +# Blackberry also has support for stack smashing protection in its libc +QMAKE_CFLAGS += -fstack-protector -fstack-protector-all + +include(../qnx-armv7le-qcc/qmake.conf) diff --git a/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h b/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h new file mode 100644 index 0000000000..657cb56e5e --- /dev/null +++ b/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h @@ -0,0 +1,44 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Research In Motion Limited. +** 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$ +** +****************************************************************************/ + +#include "../qnx-armv7le-qcc/qplatformdefs.h" + +#define QT_QPA_DEFAULT_PLATFORM_NAME "blackberry" diff --git a/mkspecs/blackberry-x86-qcc/qmake.conf b/mkspecs/blackberry-x86-qcc/qmake.conf new file mode 100644 index 0000000000..60b67f801e --- /dev/null +++ b/mkspecs/blackberry-x86-qcc/qmake.conf @@ -0,0 +1,12 @@ +# +# qmake configuration for blackberry x86 systems +# + +DEFINES += Q_OS_BLACKBERRY +CONFIG += blackberry +LIBS += -lbps + +# Blackberry also has support for stack smashing protection in its libc +QMAKE_CFLAGS += -fstack-protector -fstack-protector-all + +include(../qnx-x86-qcc/qmake.conf) diff --git a/mkspecs/blackberry-x86-qcc/qplatformdefs.h b/mkspecs/blackberry-x86-qcc/qplatformdefs.h new file mode 100644 index 0000000000..4d198c37c8 --- /dev/null +++ b/mkspecs/blackberry-x86-qcc/qplatformdefs.h @@ -0,0 +1,44 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Research In Motion Limited. +** 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$ +** +****************************************************************************/ + +#include "../qnx-x86-qcc/qplatformdefs.h" + +#define QT_QPA_DEFAULT_PLATFORM_NAME "blackberry" diff --git a/mkspecs/qnx-armv7le-qcc/qmake.conf b/mkspecs/qnx-armv7le-qcc/qmake.conf new file mode 100644 index 0000000000..c80d84474b --- /dev/null +++ b/mkspecs/qnx-armv7le-qcc/qmake.conf @@ -0,0 +1,26 @@ +# +# qmake configuration for qnx-qcc armv7 target +# + +MAKEFILE_GENERATOR = UNIX +TARGET_PLATFORM = unix +TEMPLATE = app +CONFIG += qt warn_on release link_prl qnx +QT += core gui + +include(../common/g++-unix.conf) +include(../common/unix.conf) + +QMAKE_CC = qcc -Vgcc_ntoarmv7le +QMAKE_CXX = qcc -Vgcc_ntoarmv7le +QNX_CPUDIR = armle-v7 + +include(../common/qcc-base-qnx.conf) + +QMAKE_AR = ntoarmv7-ar cqs +QMAKE_OBJCOPY = ntoarmv7-objcopy +QMAKE_RANLIB = ntoarmv7-ranlib + +QMAKE_STRIP = ntoarmv7-strip + +load(qt_config) diff --git a/mkspecs/qnx-armv7le-qcc/qplatformdefs.h b/mkspecs/qnx-armv7le-qcc/qplatformdefs.h new file mode 100644 index 0000000000..91945a0a22 --- /dev/null +++ b/mkspecs/qnx-armv7le-qcc/qplatformdefs.h @@ -0,0 +1,104 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Research In Motion Limited. +** 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 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 + +#define __STDC_CONSTANT_MACROS + +// We are hot - unistd.h should have turned on the specific APIs we requested + + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +// QNX doesn't have the System V header. This is not a standard +// POSIX header, it's only documented in the Single UNIX Specification. +// The preferred POSIX compliant way to share memory is to use the functions +// in that comply with the POSIX Real Time Interface (1003.1b). +#include +#include +#include +#include +#include +#ifndef QT_NO_IPV6IFNAME +#include +#endif + +// for htonl +#include + +#define QT_USE_XOPEN_LFS_EXTENSIONS +#define QT_NO_READDIR64 +#include "../common/posix/qplatformdefs.h" + +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf + +// QNX6 doesn't have getpagesize() +inline int getpagesize() +{ + return ::sysconf(_SC_PAGESIZE); +} + +#include + +#define QT_QWS_TEMP_DIR QString::fromLatin1(qgetenv("TMP")) + +#define QT_NO_QWS_INPUTMETHODS + +#endif // QPLATFORMDEFS_H diff --git a/mkspecs/qnx-x86-qcc/qmake.conf b/mkspecs/qnx-x86-qcc/qmake.conf new file mode 100644 index 0000000000..48dcde8787 --- /dev/null +++ b/mkspecs/qnx-x86-qcc/qmake.conf @@ -0,0 +1,26 @@ +# +# qmake configuration for qnx-qcc x86 target +# + +MAKEFILE_GENERATOR = UNIX +TARGET_PLATFORM = unix +TEMPLATE = app +CONFIG += qt warn_on release link_prl qnx +QT += core gui + +include(../common/g++-unix.conf) +include(../common/unix.conf) + +QMAKE_CC = qcc -Vgcc_ntox86 +QMAKE_CXX = qcc -Vgcc_ntox86 +QNX_CPUDIR = x86 + +include(../common/qcc-base-qnx.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/qnx-x86-qcc/qplatformdefs.h b/mkspecs/qnx-x86-qcc/qplatformdefs.h new file mode 100644 index 0000000000..91945a0a22 --- /dev/null +++ b/mkspecs/qnx-x86-qcc/qplatformdefs.h @@ -0,0 +1,104 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Research In Motion Limited. +** 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 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 + +#define __STDC_CONSTANT_MACROS + +// We are hot - unistd.h should have turned on the specific APIs we requested + + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +// QNX doesn't have the System V header. This is not a standard +// POSIX header, it's only documented in the Single UNIX Specification. +// The preferred POSIX compliant way to share memory is to use the functions +// in that comply with the POSIX Real Time Interface (1003.1b). +#include +#include +#include +#include +#include +#ifndef QT_NO_IPV6IFNAME +#include +#endif + +// for htonl +#include + +#define QT_USE_XOPEN_LFS_EXTENSIONS +#define QT_NO_READDIR64 +#include "../common/posix/qplatformdefs.h" + +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf + +// QNX6 doesn't have getpagesize() +inline int getpagesize() +{ + return ::sysconf(_SC_PAGESIZE); +} + +#include + +#define QT_QWS_TEMP_DIR QString::fromLatin1(qgetenv("TMP")) + +#define QT_NO_QWS_INPUTMETHODS + +#endif // QPLATFORMDEFS_H diff --git a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf b/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf deleted file mode 100644 index 4e72667c5d..0000000000 --- a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf +++ /dev/null @@ -1,12 +0,0 @@ -# -# qmake configuration for blackberry x86 systems -# - -DEFINES += Q_OS_BLACKBERRY -CONFIG += blackberry -LIBS += -lbps - -# Blackberry also has support for stack smashing protection in its libc -QMAKE_CFLAGS += -fstack-protector -fstack-protector-all - -include(../qnx-armv7le-qcc/qmake.conf) diff --git a/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h b/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h deleted file mode 100644 index 657cb56e5e..0000000000 --- a/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Research In Motion Limited. -** 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$ -** -****************************************************************************/ - -#include "../qnx-armv7le-qcc/qplatformdefs.h" - -#define QT_QPA_DEFAULT_PLATFORM_NAME "blackberry" diff --git a/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf b/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf deleted file mode 100644 index 60b67f801e..0000000000 --- a/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf +++ /dev/null @@ -1,12 +0,0 @@ -# -# qmake configuration for blackberry x86 systems -# - -DEFINES += Q_OS_BLACKBERRY -CONFIG += blackberry -LIBS += -lbps - -# Blackberry also has support for stack smashing protection in its libc -QMAKE_CFLAGS += -fstack-protector -fstack-protector-all - -include(../qnx-x86-qcc/qmake.conf) diff --git a/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h b/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h deleted file mode 100644 index 4d198c37c8..0000000000 --- a/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Research In Motion Limited. -** 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$ -** -****************************************************************************/ - -#include "../qnx-x86-qcc/qplatformdefs.h" - -#define QT_QPA_DEFAULT_PLATFORM_NAME "blackberry" diff --git a/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf b/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf deleted file mode 100644 index de0d5db290..0000000000 --- a/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf +++ /dev/null @@ -1,26 +0,0 @@ -# -# qmake configuration for qnx-qcc armv7 target -# - -MAKEFILE_GENERATOR = UNIX -TARGET_PLATFORM = unix -TEMPLATE = app -CONFIG += qt warn_on release link_prl qnx -QT += core gui - -include(../../common/g++-unix.conf) -include(../../common/unix.conf) - -QMAKE_CC = qcc -Vgcc_ntoarmv7le -QMAKE_CXX = qcc -Vgcc_ntoarmv7le -QNX_CPUDIR = armle-v7 - -include(../../common/qcc-base-qnx.conf) - -QMAKE_AR = ntoarmv7-ar cqs -QMAKE_OBJCOPY = ntoarmv7-objcopy -QMAKE_RANLIB = ntoarmv7-ranlib - -QMAKE_STRIP = ntoarmv7-strip - -load(qt_config) diff --git a/mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h b/mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h deleted file mode 100644 index 8aaca4402b..0000000000 --- a/mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h +++ /dev/null @@ -1,104 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Research In Motion Limited. -** 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 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 - -#define __STDC_CONSTANT_MACROS - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -// QNX doesn't have the System V header. This is not a standard -// POSIX header, it's only documented in the Single UNIX Specification. -// The preferred POSIX compliant way to share memory is to use the functions -// in that comply with the POSIX Real Time Interface (1003.1b). -#include -#include -#include -#include -#include -#ifndef QT_NO_IPV6IFNAME -#include -#endif - -// for htonl -#include - -#define QT_USE_XOPEN_LFS_EXTENSIONS -#define QT_NO_READDIR64 -#include "../../common/posix/qplatformdefs.h" - -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf - -// QNX6 doesn't have getpagesize() -inline int getpagesize() -{ - return ::sysconf(_SC_PAGESIZE); -} - -#include - -#define QT_QWS_TEMP_DIR QString::fromLatin1(qgetenv("TMP")) - -#define QT_NO_QWS_INPUTMETHODS - -#endif // QPLATFORMDEFS_H diff --git a/mkspecs/unsupported/qnx-x86-qcc/qmake.conf b/mkspecs/unsupported/qnx-x86-qcc/qmake.conf deleted file mode 100644 index 55584c29eb..0000000000 --- a/mkspecs/unsupported/qnx-x86-qcc/qmake.conf +++ /dev/null @@ -1,26 +0,0 @@ -# -# qmake configuration for qnx-qcc x86 target -# - -MAKEFILE_GENERATOR = UNIX -TARGET_PLATFORM = unix -TEMPLATE = app -CONFIG += qt warn_on release link_prl qnx -QT += core gui - -include(../../common/g++-unix.conf) -include(../../common/unix.conf) - -QMAKE_CC = qcc -Vgcc_ntox86 -QMAKE_CXX = qcc -Vgcc_ntox86 -QNX_CPUDIR = x86 - -include(../../common/qcc-base-qnx.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/qnx-x86-qcc/qplatformdefs.h b/mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h deleted file mode 100644 index 8aaca4402b..0000000000 --- a/mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h +++ /dev/null @@ -1,104 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Research In Motion Limited. -** 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 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 - -#define __STDC_CONSTANT_MACROS - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -// QNX doesn't have the System V header. This is not a standard -// POSIX header, it's only documented in the Single UNIX Specification. -// The preferred POSIX compliant way to share memory is to use the functions -// in that comply with the POSIX Real Time Interface (1003.1b). -#include -#include -#include -#include -#include -#ifndef QT_NO_IPV6IFNAME -#include -#endif - -// for htonl -#include - -#define QT_USE_XOPEN_LFS_EXTENSIONS -#define QT_NO_READDIR64 -#include "../../common/posix/qplatformdefs.h" - -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf - -// QNX6 doesn't have getpagesize() -inline int getpagesize() -{ - return ::sysconf(_SC_PAGESIZE); -} - -#include - -#define QT_QWS_TEMP_DIR QString::fromLatin1(qgetenv("TMP")) - -#define QT_NO_QWS_INPUTMETHODS - -#endif // QPLATFORMDEFS_H -- cgit v1.2.1