From 64111efde9795c51cda7aa0b63d2b4b597aa139c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Fri, 2 Oct 2009 13:31:23 +0200 Subject: renaming ppc mkspec to powerpc Reviewed-by:paul --- configure | 5 +--- mkspecs/qws/linux-powerpc-g++/qmake.conf | 20 +++++++++++++ mkspecs/qws/linux-powerpc-g++/qplatformdefs.h | 42 +++++++++++++++++++++++++++ mkspecs/qws/linux-ppc-g++/qmake.conf | 20 ------------- mkspecs/qws/linux-ppc-g++/qplatformdefs.h | 42 --------------------------- 5 files changed, 63 insertions(+), 66 deletions(-) create mode 100644 mkspecs/qws/linux-powerpc-g++/qmake.conf create mode 100644 mkspecs/qws/linux-powerpc-g++/qplatformdefs.h delete mode 100644 mkspecs/qws/linux-ppc-g++/qmake.conf delete mode 100644 mkspecs/qws/linux-ppc-g++/qplatformdefs.h diff --git a/configure b/configure index 8ef8ad0..ea50b37 100755 --- a/configure +++ b/configure @@ -2330,9 +2330,6 @@ if [ "$CFG_EMBEDDED" != "no" ]; then *86_64) CFG_EMBEDDED=x86_64 ;; - *ppc) - CFG_EMBEDDED=ppc - ;; *) CFG_EMBEDDED=generic ;; @@ -2762,7 +2759,7 @@ if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then ipaq|sharp) CFG_ARCH=arm ;; - dm7000|ppc) + dm7000) CFG_ARCH=powerpc ;; dm800) diff --git a/mkspecs/qws/linux-powerpc-g++/qmake.conf b/mkspecs/qws/linux-powerpc-g++/qmake.conf new file mode 100644 index 0000000..e1926b4 --- /dev/null +++ b/mkspecs/qws/linux-powerpc-g++/qmake.conf @@ -0,0 +1,20 @@ +# +# qmake configuration for building with g++ +# + +include(../../common/g++.conf) +include(../../common/linux.conf) +include(../../common/qws.conf) + +# modifications to g++.conf +QMAKE_CC = powerpc-linux-gcc +QMAKE_CXX = powerpc-linux-g++ +QMAKE_LINK = powerpc-linux-g++ +QMAKE_LINK_SHLIB = powerpc-linux-g++ + +# modifications to linux.conf +QMAKE_AR = powerpc-linux-ar cqs +QMAKE_OBJCOPY = powerpc-linux-objcopy +QMAKE_STRIP = powerpc-linux-strip + +load(qt_config) diff --git a/mkspecs/qws/linux-powerpc-g++/qplatformdefs.h b/mkspecs/qws/linux-powerpc-g++/qplatformdefs.h new file mode 100644 index 0000000..60e0f5e --- /dev/null +++ b/mkspecs/qws/linux-powerpc-g++/qplatformdefs.h @@ -0,0 +1,42 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the qmake spec of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** 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, 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. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "../../linux-g++/qplatformdefs.h" diff --git a/mkspecs/qws/linux-ppc-g++/qmake.conf b/mkspecs/qws/linux-ppc-g++/qmake.conf deleted file mode 100644 index e1926b4..0000000 --- a/mkspecs/qws/linux-ppc-g++/qmake.conf +++ /dev/null @@ -1,20 +0,0 @@ -# -# qmake configuration for building with g++ -# - -include(../../common/g++.conf) -include(../../common/linux.conf) -include(../../common/qws.conf) - -# modifications to g++.conf -QMAKE_CC = powerpc-linux-gcc -QMAKE_CXX = powerpc-linux-g++ -QMAKE_LINK = powerpc-linux-g++ -QMAKE_LINK_SHLIB = powerpc-linux-g++ - -# modifications to linux.conf -QMAKE_AR = powerpc-linux-ar cqs -QMAKE_OBJCOPY = powerpc-linux-objcopy -QMAKE_STRIP = powerpc-linux-strip - -load(qt_config) diff --git a/mkspecs/qws/linux-ppc-g++/qplatformdefs.h b/mkspecs/qws/linux-ppc-g++/qplatformdefs.h deleted file mode 100644 index 60e0f5e..0000000 --- a/mkspecs/qws/linux-ppc-g++/qplatformdefs.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the qmake spec of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** 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, 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. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "../../linux-g++/qplatformdefs.h" -- cgit v0.12