Rename BlackBerry arm mkspecs to be aligned with NDK structure
The current NDK 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 blackberry-armv7le-qcc to blackberry-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. Change-Id: Ia7feeeabe16eda48140a65178af28cbb9bd085a9 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
This commit is contained in:
Wolfgang Bremer
The Qt Project
parent
d8745d249f
commit
fe61f2d6b2
22
mkspecs/blackberry-armle-v7-qcc/qmake.conf
Normal file
22
mkspecs/blackberry-armle-v7-qcc/qmake.conf
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
#
|
||||||
|
# qmake configuration for blackberry armv7le systems
|
||||||
|
#
|
||||||
|
|
||||||
|
load(qt_config)
|
||||||
|
|
||||||
|
DEFINES += Q_OS_BLACKBERRY
|
||||||
|
CONFIG += blackberry
|
||||||
|
LIBS += -lbps
|
||||||
|
|
||||||
|
# Blackberry also has support for stack smashing protection in its libc
|
||||||
|
contains(QT_CONFIG, stack-protector-strong) {
|
||||||
|
QMAKE_CFLAGS += -fstack-protector-strong
|
||||||
|
} else {
|
||||||
|
QMAKE_CFLAGS += -fstack-protector -fstack-protector-all
|
||||||
|
}
|
||||||
|
|
||||||
|
QMAKE_CFLAGS += -mcpu=cortex-a9 -mtune=cortex-a9 -mthumb -D_FORTIFY_SOURCE=2
|
||||||
|
|
||||||
|
QMAKE_LFLAGS_SHLIB += -Wl,-z,relro -Wl,-z,now
|
||||||
|
|
||||||
|
include(../common/qcc-base-qnx-armv7le.conf)
|
||||||
42
mkspecs/blackberry-armle-v7-qcc/qplatformdefs.h
Normal file
42
mkspecs/blackberry-armle-v7-qcc/qplatformdefs.h
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2012 - 2013 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$
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include "../qnx-armv7le-qcc/qplatformdefs.h"
|
||||||
@ -1,22 +1,5 @@
|
|||||||
#
|
#
|
||||||
# qmake configuration for blackberry armv7le systems
|
# deprecated, please use blackberry-armle-v7-qcc instead
|
||||||
#
|
#
|
||||||
|
warning("You are using deprecated mkspecs. Please use blackberry-armle-v7-qcc instead.")
|
||||||
load(qt_config)
|
include(../blackberry-armle-v7-qcc/qmake.conf)
|
||||||
|
|
||||||
DEFINES += Q_OS_BLACKBERRY
|
|
||||||
CONFIG += blackberry
|
|
||||||
LIBS += -lbps
|
|
||||||
|
|
||||||
# Blackberry also has support for stack smashing protection in its libc
|
|
||||||
contains(QT_CONFIG, stack-protector-strong) {
|
|
||||||
QMAKE_CFLAGS += -fstack-protector-strong
|
|
||||||
} else {
|
|
||||||
QMAKE_CFLAGS += -fstack-protector -fstack-protector-all
|
|
||||||
}
|
|
||||||
|
|
||||||
QMAKE_CFLAGS += -mcpu=cortex-a9 -mtune=cortex-a9 -mthumb -D_FORTIFY_SOURCE=2
|
|
||||||
|
|
||||||
QMAKE_LFLAGS_SHLIB += -Wl,-z,relro -Wl,-z,now
|
|
||||||
|
|
||||||
include(../common/qcc-base-qnx-armv7le.conf)
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
**
|
**
|
||||||
** Copyright (C) 2012 Research In Motion Limited. <blackberry-qt@qnx.com>
|
** Copyright (C) 2012 - 2013 BlackBerry Limited. All rights reserved.
|
||||||
** Contact: http://www.qt-project.org/legal
|
** Contact: http://www.qt-project.org/legal
|
||||||
**
|
**
|
||||||
** This file is part of the QtCore module of the Qt Toolkit.
|
** This file is part of the QtCore module of the Qt Toolkit.
|
||||||
@ -39,4 +39,4 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include "../qnx-armv7le-qcc/qplatformdefs.h"
|
#include "../blackberry-armle-v7-qcc/qplatformdefs.h"
|
||||||
|
|||||||
@ -0,0 +1,8 @@
|
|||||||
|
#
|
||||||
|
# qmake configuration for the Blackberry Playbook armv7le
|
||||||
|
#
|
||||||
|
|
||||||
|
include(../../blackberry-armle-v7-qcc/qmake.conf)
|
||||||
|
|
||||||
|
DEFINES += Q_OS_BLACKBERRY_TABLET
|
||||||
|
CONFIG += blackberry-playbook
|
||||||
@ -0,0 +1,42 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2013 Klarälvdalens Datakonsult AB <info@kdab.com>
|
||||||
|
** 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$
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include "../../blackberry-armle-v7-qcc/qplatformdefs.h"
|
||||||
@ -1,8 +1,5 @@
|
|||||||
#
|
#
|
||||||
# qmake configuration for the Blackberry Playbook armv7le
|
# deprecated, please use blackberry-playbook-armle-v7-qcc instead
|
||||||
#
|
#
|
||||||
|
warning("You are using deprecated mkspecs. Please use blackberry-playbook-armle-v7-qcc instead.")
|
||||||
include(../../blackberry-armv7le-qcc/qmake.conf)
|
include(../blackberry-playbook-armle-v7-qcc/qmake.conf)
|
||||||
|
|
||||||
DEFINES += Q_OS_BLACKBERRY_TABLET
|
|
||||||
CONFIG += blackberry-playbook
|
|
||||||
|
|||||||
@ -39,4 +39,4 @@
|
|||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include "../../blackberry-armv7le-qcc/qplatformdefs.h"
|
#include "../blackberry-playbook-armle-v7-qcc/qplatformdefs.h"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user