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/devices | |
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/devices')
4 files changed, 54 insertions, 7 deletions
diff --git a/mkspecs/devices/blackberry-playbook-armle-v7-qcc/qmake.conf b/mkspecs/devices/blackberry-playbook-armle-v7-qcc/qmake.conf new file mode 100644 index 0000000000..c9c883a206 --- /dev/null +++ b/mkspecs/devices/blackberry-playbook-armle-v7-qcc/qmake.conf @@ -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 diff --git a/mkspecs/devices/blackberry-playbook-armle-v7-qcc/qplatformdefs.h b/mkspecs/devices/blackberry-playbook-armle-v7-qcc/qplatformdefs.h new file mode 100644 index 0000000000..a78e441501 --- /dev/null +++ b/mkspecs/devices/blackberry-playbook-armle-v7-qcc/qplatformdefs.h @@ -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" diff --git a/mkspecs/devices/blackberry-playbook-armv7le-qcc/qmake.conf b/mkspecs/devices/blackberry-playbook-armv7le-qcc/qmake.conf index cc7435d1dc..1b3299659f 100644 --- a/mkspecs/devices/blackberry-playbook-armv7le-qcc/qmake.conf +++ b/mkspecs/devices/blackberry-playbook-armv7le-qcc/qmake.conf @@ -1,8 +1,5 @@ # -# qmake configuration for the Blackberry Playbook armv7le +# deprecated, please use blackberry-playbook-armle-v7-qcc instead # - -include(../../blackberry-armv7le-qcc/qmake.conf) - -DEFINES += Q_OS_BLACKBERRY_TABLET -CONFIG += blackberry-playbook +warning("You are using deprecated mkspecs. Please use blackberry-playbook-armle-v7-qcc instead.") +include(../blackberry-playbook-armle-v7-qcc/qmake.conf) diff --git a/mkspecs/devices/blackberry-playbook-armv7le-qcc/qplatformdefs.h b/mkspecs/devices/blackberry-playbook-armv7le-qcc/qplatformdefs.h index 127ca957dd..61cd7119cc 100644 --- a/mkspecs/devices/blackberry-playbook-armv7le-qcc/qplatformdefs.h +++ b/mkspecs/devices/blackberry-playbook-armv7le-qcc/qplatformdefs.h @@ -39,4 +39,4 @@ ** ****************************************************************************/ -#include "../../blackberry-armv7le-qcc/qplatformdefs.h" +#include "../blackberry-playbook-armle-v7-qcc/qplatformdefs.h" |