summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Roquetto <rafael.roquetto.qnx@kdab.com>2015-01-12 13:17:40 -0200
committerRafael Roquetto <rafael.roquetto@kdab.com>2015-01-18 00:12:34 +0100
commit3f0ce8c0c88e7839f584bbae50a024a90f653370 (patch)
tree7a5d39ee3404934297c43070bba5637aa0ee9052
parente4d15b41e83d552c64f32541570f9009a6c6ec81 (diff)
QNX: Remove deprecated armv7le mkspecs.
Use the armle-v7 ones instead. Change-Id: I981cb4bed7e14cae8f89112df2d1d014db314cd9 Reviewed-by: Wolfgang Bremer <wolfgang@w-bremer.de> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-rw-r--r--mkspecs/blackberry-armv7le-qcc/qmake.conf5
-rw-r--r--mkspecs/blackberry-armv7le-qcc/qplatformdefs.h34
-rw-r--r--mkspecs/devices/blackberry-playbook-armv7le-qcc/qmake.conf5
-rw-r--r--mkspecs/devices/blackberry-playbook-armv7le-qcc/qplatformdefs.h34
-rw-r--r--mkspecs/qnx-armv7le-qcc/qmake.conf5
-rw-r--r--mkspecs/qnx-armv7le-qcc/qplatformdefs.h34
6 files changed, 0 insertions, 117 deletions
diff --git a/mkspecs/blackberry-armv7le-qcc/qmake.conf b/mkspecs/blackberry-armv7le-qcc/qmake.conf
deleted file mode 100644
index ec462457c4..0000000000
--- a/mkspecs/blackberry-armv7le-qcc/qmake.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# deprecated, please use blackberry-armle-v7-qcc instead
-#
-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
deleted file mode 100644
index d04b599593..0000000000
--- a/mkspecs/blackberry-armv7le-qcc/qplatformdefs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/****************************************************************************
-**
-** 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: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 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 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.
-**
-** 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.
-**
-** $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
deleted file mode 100644
index 1b3299659f..0000000000
--- a/mkspecs/devices/blackberry-playbook-armv7le-qcc/qmake.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# 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-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
deleted file mode 100644
index c6ac9f77bb..0000000000
--- a/mkspecs/devices/blackberry-playbook-armv7le-qcc/qplatformdefs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/****************************************************************************
-**
-** 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: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 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 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.
-**
-** 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.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "../blackberry-playbook-armle-v7-qcc/qplatformdefs.h"
diff --git a/mkspecs/qnx-armv7le-qcc/qmake.conf b/mkspecs/qnx-armv7le-qcc/qmake.conf
deleted file mode 100644
index daae30168d..0000000000
--- a/mkspecs/qnx-armv7le-qcc/qmake.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# deprecated, please use qnx-armle-v7-qcc instead
-#
-warning("You are using deprecated mkspecs. Please use qnx-armle-v7-qcc instead.")
-include(../qnx-armle-v7-qcc/qmake.conf)
diff --git a/mkspecs/qnx-armv7le-qcc/qplatformdefs.h b/mkspecs/qnx-armv7le-qcc/qplatformdefs.h
deleted file mode 100644
index 8596672bab..0000000000
--- a/mkspecs/qnx-armv7le-qcc/qplatformdefs.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 - 2014 BlackBerry Limited. All rights reserved.
-** Contact: http://www.qt-project.org/legal
-**
-** 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 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 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.
-**
-** 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.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "../qnx-armle-v7-qcc/qplatformdefs.h"