From 28fe4e3a864b799e4e4b9e0c2dc251f03459d85e Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 29 Jul 2014 12:15:17 +0200 Subject: Remove specific maemo/meego codepaths We no longer support the maemo/meego platform, so we can remove the specific code for that platform. Change-Id: Ia7f0730eba2d96794b97b7ca4753f63a2d7bc2a8 Reviewed-by: Laszlo Agocs Reviewed-by: Robin Burchell --- mkspecs/devices/linux-maemo-n9-g++/qmake.conf | 36 ------------------- mkspecs/devices/linux-maemo-n9-g++/qplatformdefs.h | 42 ---------------------- 2 files changed, 78 deletions(-) delete mode 100644 mkspecs/devices/linux-maemo-n9-g++/qmake.conf delete mode 100644 mkspecs/devices/linux-maemo-n9-g++/qplatformdefs.h (limited to 'mkspecs/devices') diff --git a/mkspecs/devices/linux-maemo-n9-g++/qmake.conf b/mkspecs/devices/linux-maemo-n9-g++/qmake.conf deleted file mode 100644 index 1c18fc5c80..0000000000 --- a/mkspecs/devices/linux-maemo-n9-g++/qmake.conf +++ /dev/null @@ -1,36 +0,0 @@ -# -# qmake configuration for building Qt5 for the Nokia N9 -# http://wiki.qt-project.org/Devices/N9 - -MAKEFILE_GENERATOR = UNIX -CONFIG += incremental -QMAKE_INCREMENTAL_STYLE = sublib - -QMAKE_PLATFORM = maemo - -include(../../common/linux.conf) -include(../../common/gcc-base-unix.conf) -include(../../common/g++-unix.conf) - -load(device_config) - -# modifications to g++.conf -QMAKE_CC = $${CROSS_COMPILE}gcc -QMAKE_CXX = $${CROSS_COMPILE}g++ -QMAKE_LINK = $${QMAKE_CXX} -QMAKE_LINK_SHLIB = $${QMAKE_CXX} - -# modifications to linux.conf -QMAKE_AR = $${CROSS_COMPILE}ar cqs -QMAKE_OBJCOPY = $${CROSS_COMPILE}objcopy -QMAKE_NM = $${CROSS_COMPILE}nm -P -QMAKE_STRIP = $${CROSS_COMPILE}strip - -QMAKE_CFLAGS += -mfloat-abi=hard -mfpu=neon -march=armv7-a -mcpu=cortex-a8 -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS - -QT_QPA_DEFAULT_PLATFORM = xcb - -deviceSanityCheckCompiler() - -load(qt_config) diff --git a/mkspecs/devices/linux-maemo-n9-g++/qplatformdefs.h b/mkspecs/devices/linux-maemo-n9-g++/qplatformdefs.h deleted file mode 100644 index 461f3d5589..0000000000 --- a/mkspecs/devices/linux-maemo-n9-g++/qplatformdefs.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the qmake spec 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 "../../linux-g++/qplatformdefs.h" -- cgit v1.2.3