diff options
author | James McDonnell <jmcdonnell@qnx.com> | 2016-06-09 12:16:25 -0400 |
---|---|---|
committer | James McDonnell <jmcdonnell@qnx.com> | 2016-06-22 14:59:26 +0000 |
commit | f99bcd763d590be43dbc297699960f66edd6ad19 (patch) | |
tree | 9300de6163a6088eb3b5b62c39f718c0975ed1d9 /mkspecs/qnx-aarch64le-qcc | |
parent | 450e7f06f22e6a30c85624b4d37f8433cbfd3b73 (diff) | |
download | qtbase-f99bcd763d590be43dbc297699960f66edd6ad19.tar.gz |
Add some 64-bit QNX platforms
Add x86-64 and aarch64le QNX platforms. These platforms will be
available in QNX 7.0.
Change-Id: Iba1f635ba45fddf1a1caf907415a23a510ba0818
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'mkspecs/qnx-aarch64le-qcc')
-rw-r--r-- | mkspecs/qnx-aarch64le-qcc/qmake.conf | 17 | ||||
-rw-r--r-- | mkspecs/qnx-aarch64le-qcc/qplatformdefs.h | 34 |
2 files changed, 51 insertions, 0 deletions
diff --git a/mkspecs/qnx-aarch64le-qcc/qmake.conf b/mkspecs/qnx-aarch64le-qcc/qmake.conf new file mode 100644 index 0000000000..8e229d360b --- /dev/null +++ b/mkspecs/qnx-aarch64le-qcc/qmake.conf @@ -0,0 +1,17 @@ +# +# qmake configuration for qnx aarch64le systems +# + +DEFINES += QT_NO_CLIPBOARD _FORTIFY_SOURCE=2 + +QMAKE_LFLAGS_SHLIB += -Wl,-z,relro -Wl,-z,now + +include(../common/qcc-base-qnx-aarch64le.conf) + +contains(QT_CONFIG, stack-protector-strong) { + QMAKE_CFLAGS += -fstack-protector-strong + QMAKE_CXXFLAGS += -fstack-protector-strong +} else { + QMAKE_CFLAGS += -fstack-protector -fstack-protector-all + QMAKE_CXXFLAGS += -fstack-protector -fstack-protector-all +} diff --git a/mkspecs/qnx-aarch64le-qcc/qplatformdefs.h b/mkspecs/qnx-aarch64le-qcc/qplatformdefs.h new file mode 100644 index 0000000000..029ee7e062 --- /dev/null +++ b/mkspecs/qnx-aarch64le-qcc/qplatformdefs.h @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright (C) 2016 QNX Software Systems. All rights reserved. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the qmake spec of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://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 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "../qnx-armle-v7-qcc/qplatformdefs.h" |