From 940a4d0318da54daa48bd2e1983cabd9ca30b7c4 Mon Sep 17 00:00:00 2001 From: Laszlo Papp Date: Thu, 13 Sep 2012 19:38:25 +0100 Subject: Rename the N9 device mkspecs folder to match the *-maemo* regex Change-Id: I0c7b74d67f44d776a74671d38bbc0f2424974c2c Reviewed-by: Oswald Buddenhagen Reviewed-by: Romain Pokrzywka Reviewed-by: Simon Hausmann --- mkspecs/devices/linux-maemo-n9-g++/qmake.conf | 33 +++++++++++++++++ mkspecs/devices/linux-maemo-n9-g++/qplatformdefs.h | 42 ++++++++++++++++++++++ mkspecs/devices/linux-n9-g++/qmake.conf | 33 ----------------- mkspecs/devices/linux-n9-g++/qplatformdefs.h | 42 ---------------------- 4 files changed, 75 insertions(+), 75 deletions(-) create mode 100644 mkspecs/devices/linux-maemo-n9-g++/qmake.conf create mode 100644 mkspecs/devices/linux-maemo-n9-g++/qplatformdefs.h delete mode 100644 mkspecs/devices/linux-n9-g++/qmake.conf delete mode 100644 mkspecs/devices/linux-n9-g++/qplatformdefs.h diff --git a/mkspecs/devices/linux-maemo-n9-g++/qmake.conf b/mkspecs/devices/linux-maemo-n9-g++/qmake.conf new file mode 100644 index 0000000000..0a580a9fc2 --- /dev/null +++ b/mkspecs/devices/linux-maemo-n9-g++/qmake.conf @@ -0,0 +1,33 @@ +# +# qmake configuration for building Qt5 for the Nokia N9 +# http://wiki.qt-project.org/Devices/N9 + +MAKEFILE_GENERATOR = UNIX +CONFIG += incremental gdb_dwarf_index +QMAKE_INCREMENTAL_STYLE = sublib + +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_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 new file mode 100644 index 0000000000..9e6b0f5bcc --- /dev/null +++ b/mkspecs/devices/linux-maemo-n9-g++/qplatformdefs.h @@ -0,0 +1,42 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the qmake spec of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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, Nokia gives you certain additional +** rights. These rights are described in the Nokia 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "../../linux-g++/qplatformdefs.h" diff --git a/mkspecs/devices/linux-n9-g++/qmake.conf b/mkspecs/devices/linux-n9-g++/qmake.conf deleted file mode 100644 index 0a580a9fc2..0000000000 --- a/mkspecs/devices/linux-n9-g++/qmake.conf +++ /dev/null @@ -1,33 +0,0 @@ -# -# qmake configuration for building Qt5 for the Nokia N9 -# http://wiki.qt-project.org/Devices/N9 - -MAKEFILE_GENERATOR = UNIX -CONFIG += incremental gdb_dwarf_index -QMAKE_INCREMENTAL_STYLE = sublib - -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_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-n9-g++/qplatformdefs.h b/mkspecs/devices/linux-n9-g++/qplatformdefs.h deleted file mode 100644 index 9e6b0f5bcc..0000000000 --- a/mkspecs/devices/linux-n9-g++/qplatformdefs.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../../linux-g++/qplatformdefs.h" -- cgit v1.2.3