diff options
| author | Wolfgang Bremer <wbremer@blackberry.com> | 2013-10-22 16:18:11 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-23 19:09:54 +0200 |
| commit | fe61f2d6b29cca87b46dc37c7968b2f765f670ef (patch) | |
| tree | ce282f8e93bb81f1bac91ebe509f28c323b069ab /mkspecs/blackberry-armv7le-qcc | |
| parent | d8745d249fdeaf40b0c8309c6922f034f794ae70 (diff) | |
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>
Diffstat (limited to 'mkspecs/blackberry-armv7le-qcc')
| -rw-r--r-- | mkspecs/blackberry-armv7le-qcc/qmake.conf | 23 | ||||
| -rw-r--r-- | mkspecs/blackberry-armv7le-qcc/qplatformdefs.h | 4 |
2 files changed, 5 insertions, 22 deletions
diff --git a/mkspecs/blackberry-armv7le-qcc/qmake.conf b/mkspecs/blackberry-armv7le-qcc/qmake.conf index 2e24e4e0d3..ec462457c4 100644 --- a/mkspecs/blackberry-armv7le-qcc/qmake.conf +++ b/mkspecs/blackberry-armv7le-qcc/qmake.conf @@ -1,22 +1,5 @@ # -# qmake configuration for blackberry armv7le systems +# deprecated, please use blackberry-armle-v7-qcc instead # - -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) +warning("You are using deprecated mkspecs. Please use blackberry-armle-v7-qcc instead.") +include(../blackberry-armle-v7-qcc/qmake.conf) diff --git a/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h b/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h index b15869f163..a3e7b16ef7 100644 --- a/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h +++ b/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h @@ -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 ** ** 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" |