From 9ce697f2d54be6d94381c72af28dda79cbc027d4 Mon Sep 17 00:00:00 2001 From: Wolfgang Bremer Date: Thu, 3 Apr 2014 12:31:54 +0200 Subject: Rename QNX arm mkspecs to be aligned with SDP structure The current SDP uses CPUVARDIR variable to define whether x86 or armle-v7 is used. Therefore, the whole structure uses these two definitions to separate simulator and device builds. Renaming qnx-armv7le-qcc to qnx-armle-v7-qcc allows to directly use CPUVARDIR during Qt5 builds. For compatibility reasons the old folder is kept and includes the new qmake.conf. This change is similar to fe61f2d6b29cca87b46dc37c7968b2f765f670ef where we already aligned the BB10 mkspecs to the NDK structure. Change-Id: I7e1c0c2d137dc4049549233940e7f9d1c9f671f0 Reviewed-by: Andreas Holzammer Reviewed-by: Oswald Buddenhagen Reviewed-by: Fabian Bumberger --- mkspecs/blackberry-armle-v7-qcc/qplatformdefs.h | 2 +- mkspecs/qnx-armle-v7-qcc/qmake.conf | 7 ++ mkspecs/qnx-armle-v7-qcc/qplatformdefs.h | 109 ++++++++++++++++++++++++ mkspecs/qnx-armv7le-qcc/qmake.conf | 8 +- mkspecs/qnx-armv7le-qcc/qplatformdefs.h | 71 +-------------- 5 files changed, 122 insertions(+), 75 deletions(-) create mode 100644 mkspecs/qnx-armle-v7-qcc/qmake.conf create mode 100644 mkspecs/qnx-armle-v7-qcc/qplatformdefs.h (limited to 'mkspecs') diff --git a/mkspecs/blackberry-armle-v7-qcc/qplatformdefs.h b/mkspecs/blackberry-armle-v7-qcc/qplatformdefs.h index 32becb2042..874429f634 100644 --- a/mkspecs/blackberry-armle-v7-qcc/qplatformdefs.h +++ b/mkspecs/blackberry-armle-v7-qcc/qplatformdefs.h @@ -39,4 +39,4 @@ ** ****************************************************************************/ -#include "../qnx-armv7le-qcc/qplatformdefs.h" +#include "../qnx-armle-v7-qcc/qplatformdefs.h" diff --git a/mkspecs/qnx-armle-v7-qcc/qmake.conf b/mkspecs/qnx-armle-v7-qcc/qmake.conf new file mode 100644 index 0000000000..8dd84811c1 --- /dev/null +++ b/mkspecs/qnx-armle-v7-qcc/qmake.conf @@ -0,0 +1,7 @@ +# +# qmake configuration for qnx-qcc armv7 targets +# + +include(../common/qcc-base-qnx-armv7le.conf) + +DEFINES += QT_NO_CLIPBOARD diff --git a/mkspecs/qnx-armle-v7-qcc/qplatformdefs.h b/mkspecs/qnx-armle-v7-qcc/qplatformdefs.h new file mode 100644 index 0000000000..2f95f0d392 --- /dev/null +++ b/mkspecs/qnx-armle-v7-qcc/qplatformdefs.h @@ -0,0 +1,109 @@ +/**************************************************************************** +** +** Copyright (C) 2012 - 2014 BlackBerry Limited. All rights reserved. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtCore module 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 + +#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 +#if !defined(__EXT_QNX__READDIR64_R) +#define QT_NO_READDIR64 +#endif +#include "../common/posix/qplatformdefs.h" +#if defined(__EXT_QNX__READDIR64_R) +#define QT_EXT_QNX_READDIR_R ::_readdir64_r +#elif defined(__EXT_QNX__READDIR_R) +#define QT_EXT_QNX_READDIR_R ::_readdir_r +#endif + +#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")) + +#endif // QPLATFORMDEFS_H diff --git a/mkspecs/qnx-armv7le-qcc/qmake.conf b/mkspecs/qnx-armv7le-qcc/qmake.conf index 8dd84811c1..daae30168d 100644 --- a/mkspecs/qnx-armv7le-qcc/qmake.conf +++ b/mkspecs/qnx-armv7le-qcc/qmake.conf @@ -1,7 +1,5 @@ # -# qmake configuration for qnx-qcc armv7 targets +# deprecated, please use qnx-armle-v7-qcc instead # - -include(../common/qcc-base-qnx-armv7le.conf) - -DEFINES += QT_NO_CLIPBOARD +warning("You are using deprecated mkspecs. Please use qnx-armle-v7-qcc instead.") +include(../qnx-armle-v7-qcc/qmake.conf) diff --git a/mkspecs/qnx-armv7le-qcc/qplatformdefs.h b/mkspecs/qnx-armv7le-qcc/qplatformdefs.h index b47aecde0d..bc8f6792ab 100644 --- a/mkspecs/qnx-armv7le-qcc/qplatformdefs.h +++ b/mkspecs/qnx-armv7le-qcc/qplatformdefs.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Research In Motion Limited. +** Copyright (C) 2012 - 2014 BlackBerry Limited. All rights reserved. ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -39,71 +39,4 @@ ** ****************************************************************************/ -#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 -#if !defined(__EXT_QNX__READDIR64_R) -#define QT_NO_READDIR64 -#endif -#include "../common/posix/qplatformdefs.h" -#if defined(__EXT_QNX__READDIR64_R) -#define QT_EXT_QNX_READDIR_R ::_readdir64_r -#elif defined(__EXT_QNX__READDIR_R) -#define QT_EXT_QNX_READDIR_R ::_readdir_r -#endif - -#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")) - -#endif // QPLATFORMDEFS_H +#include "../qnx-armle-v7-qcc/qplatformdefs.h" -- cgit v1.2.3