6 files changed, 148 insertions, 0 deletions
diff --git a/mkspecs/common/qcc-base-qnx-aarch64le.conf b/mkspecs/common/qcc-base-qnx-aarch64le.conf
new file mode 100644
index 0000000000..914ef33f37
--- /dev/null
+++ b/mkspecs/common/qcc-base-qnx-aarch64le.conf
@@ -0,0 +1,23 @@
+#
+# qmake configuration for qnx-qcc aarch64le targets
+#
+
+MAKEFILE_GENERATOR      = UNIX
+
+include(g++-unix.conf)
+include(unix.conf)
+
+QMAKE_CC                = qcc -Vgcc_ntoaarch64le
+QMAKE_CXX               = qcc -Vgcc_ntoaarch64le
+QNX_CPUDIR              = aarch64le
+
+include(qcc-base-qnx.conf)
+
+QMAKE_AR                = ntoaarch64-ar cqs
+QMAKE_OBJCOPY           = ntoaarch64-objcopy
+QMAKE_NM                = ntoaarch64-nm -P
+QMAKE_RANLIB            = ntoaarch64-ranlib
+
+QMAKE_STRIP             = ntoaarch64-strip
+
+load(qt_config)
diff --git a/mkspecs/common/qcc-base-qnx-x86-64.conf b/mkspecs/common/qcc-base-qnx-x86-64.conf
new file mode 100644
index 0000000000..fd04104f71
--- /dev/null
+++ b/mkspecs/common/qcc-base-qnx-x86-64.conf
@@ -0,0 +1,23 @@
+#
+# qmake configuration for qnx-qcc x86-64 targets
+#
+
+MAKEFILE_GENERATOR      = UNIX
+
+include(g++-unix.conf)
+include(unix.conf)
+
+QMAKE_CC                = qcc -Vgcc_ntox86_64
+QMAKE_CXX               = qcc -Vgcc_ntox86_64
+QNX_CPUDIR              = x86_64
+
+include(qcc-base-qnx.conf)
+
+QMAKE_AR                = ntox86_64-ar cqs
+QMAKE_OBJCOPY           = ntox86_64-objcopy
+QMAKE_NM                = ntox86_64-nm -P
+QMAKE_RANLIB            = ntox86_64-ranlib
+
+QMAKE_STRIP             = ntox86_64-strip
+
+load(qt_config)
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"
diff --git a/mkspecs/qnx-x86-64-qcc/qmake.conf b/mkspecs/qnx-x86-64-qcc/qmake.conf
new file mode 100644
index 0000000000..f1760e4072
--- /dev/null
+++ b/mkspecs/qnx-x86-64-qcc/qmake.conf
@@ -0,0 +1,17 @@
+#
+# qmake configuration for qnx x86-64 systems
+#
+
+DEFINES += QT_NO_CLIPBOARD
+
+QMAKE_LFLAGS_SHLIB += -Wl,-z,relro -Wl,-z,now
+
+include(../common/qcc-base-qnx-x86-64.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-x86-64-qcc/qplatformdefs.h b/mkspecs/qnx-x86-64-qcc/qplatformdefs.h
new file mode 100644
index 0000000000..a8c97172d0
--- /dev/null
+++ b/mkspecs/qnx-x86-64-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-x86-qcc/qplatformdefs.h"