diff options
| author | Sean Harmer <sean.harmer.qnx@kdab.com> | 2012-09-05 08:40:37 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-05 12:46:45 (GMT) |
| commit | 341b813c75d0529f9220e4a10e804d3a7cfca6af (patch) | |
| tree | f2df3e4160c0b62009efb65c34d3e3e04abc2758 /mkspecs/blackberry-armv7le-qcc | |
| parent | da034a9a68ce75b7b7b48758f43f1cb69699549a (diff) | |
| download | Qt-341b813c75d0529f9220e4a10e804d3a7cfca6af.zip Qt-341b813c75d0529f9220e4a10e804d3a7cfca6af.tar.gz Qt-341b813c75d0529f9220e4a10e804d3a7cfca6af.tar.bz2 | |
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 <kevin.krammer@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs/blackberry-armv7le-qcc')
| -rw-r--r-- | mkspecs/blackberry-armv7le-qcc/qmake.conf | 12 | ||||
| -rw-r--r-- | mkspecs/blackberry-armv7le-qcc/qplatformdefs.h | 44 |
2 files changed, 56 insertions, 0 deletions
diff --git a/mkspecs/blackberry-armv7le-qcc/qmake.conf b/mkspecs/blackberry-armv7le-qcc/qmake.conf new file mode 100644 index 0000000..4e72667 --- /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 0000000..657cb56 --- /dev/null +++ b/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h @@ -0,0 +1,44 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Research In Motion Limited. <blackberry-qt@qnx.com> +** 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" |