Renamed the symbian/linux-* mkspecs to symbian-*.

This was done for a number of reasons:
 - In order to get better consistency with the other mkspecs, which
   have the target system name followed by a hyphen and the compiler
   name.
 - There is no real reason why we should have specific mkspecs for
   compiling Symbian under Linux, when it is equally likely to work
   under other operating systems.

RevBy:    Thomas Zander

6 files changed, 0 insertions, 252 deletions

diff --git a/mkspecs/symbian/linux-armcc/features/default_post.prf b/mkspecs/symbian/linux-armcc/features/default_post.prf
deleted file mode 100644
index 7aa1f4d..0000000
--- a/mkspecs/symbian/linux-armcc/features/default_post.prf
+++ /dev/null
@@ -1,5 +0,0 @@
-load(default_post.prf)
-
-# It is important that this config be executed last,
-# and qmake does them in reverse order.
-CONFIG = symbian_building $$CONFIG
diff --git a/mkspecs/symbian/linux-armcc/qmake.conf b/mkspecs/symbian/linux-armcc/qmake.conf
deleted file mode 100644
index f058421..0000000
--- a/mkspecs/symbian/linux-armcc/qmake.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# qmake configuration for symbian/linux-armcc
-#
-
-include(../../common/symbian/symbian-makefile.conf)
-
-include(../../common/armcc.conf)
-
-QMAKE_RVCT_LINKSTYLE = 1
-
-# notice that the middle part of the following set of vars matches the TARGET content of the libs
-
-#QMAKE_qtmain_CXXFLAGS	= --arm
-#QMAKE_QtCore_CXXFLAGS	= 
-QMAKE_QtGui_LFLAGS	= "--rw-base 0x800000"
-#QMAKE_QtDBus_CXXFLAGS	= 
-#QMAKE_QtDeclarative_CXXFLAGS	= 
-#QMAKE_QtMultimedia_CXXFLAGS	= 
-#QMAKE_QtNetwork_CXXFLAGS	= 
-#QMAKE_QtOpenGL_CXXFLAGS	= 
-#QMAKE_QtOpenVG_CXXFLAGS	= 
-#QMAKE_phonon_CXXFLAGS	= 
-#QMAKE_QtScript_CXXFLAGS	= 
-#QMAKE_QtScriptTools_CXXFLAGS	= 
-#QMAKE_QtSql_CXXFLAGS	= 
-#QMAKE_QtSvg_CXXFLAGS	= 
-#QMAKE_QtTest_CXXFLAGS	= 
-#QMAKE_QtXmlPatterns_CXXFLAGS	= 
-#QMAKE_QtXml_CXXFLAGS	= 
-QMAKE_QtWebKit_CXXFLAGS	=  --arm
-# Move RW-section base address to start from 0xE00000 instead of the toolchain default 0x400000.
-QMAKE_QtWebKit_LFLAGS	=  --rw-base 0xE00000
-
-QMAKE_CFLAGS		+= --dllimport_runtime --diag_suppress 186,611,654,1300 --thumb --fpu softvfp --cpu 5T --enum_is_int -Ono_known_library --fpmode ieee_no_fenv --no_vfe --apcs /inter
-QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS
-QMAKE_LFLAGS      	+=  --symver_soname --diag_suppress 6331,6780 --bpabi --reloc --datacompressor=off --split --dll --no_scanlib
-QMAKE_LFLAGS_APP        += --entry _E32Startup
-QMAKE_LFLAGS_SHLIB      += --entry _E32Dll
-QMAKE_LFLAGS_PLUGIN     += $$QMAKE_LFLAGS_SHLIB
-
-DEFINES		+= EKA2 \
-                   __ARMCC__ \
-                   __ARMcc_2__ \
-                   __ARMCC_2_2__
-
-QMAKE_LIBDIR += $${EPOCROOT}epoc32/release/armv5/lib
-QMAKE_LIBDIR *= $$(RVCT22LIB)
-
-INCLUDEPATH = $${EPOCROOT}epoc32/include \
-    $${EPOCROOT}epoc32/include/variant \
-    $${EPOCROOT}epoc32/include/stdapis \
-    $$INCLUDEPATH
-
-exists($${EPOCROOT}epoc32/include/rvct2_2) {
-    INCLUDEPATH += $${EPOCROOT}epoc32/include/rvct2_2
-    QMAKE_CFLAGS += --preinclude rvct2_2.h
-    QMAKE_CXXFLAGS += --preinclude rvct2_2.h
-} else {
-    INCLUDEPATH += $${EPOCROOT}epoc32/include/rvct
-    QMAKE_CFLAGS += --preinclude rvct.h
-    QMAKE_CXXFLAGS += --preinclude rvct.h
-}
diff --git a/mkspecs/symbian/linux-armcc/qplatformdefs.h b/mkspecs/symbian/linux-armcc/qplatformdefs.h
deleted file mode 100644
index 3b7d023..0000000
--- a/mkspecs/symbian/linux-armcc/qplatformdefs.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the mkspecs 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 "../../common/symbian/qplatformdefs.h"
diff --git a/mkspecs/symbian/linux-gcce/features/default_post.prf b/mkspecs/symbian/linux-gcce/features/default_post.prf
deleted file mode 100644
index 7aa1f4d..0000000
--- a/mkspecs/symbian/linux-gcce/features/default_post.prf
+++ /dev/null
@@ -1,5 +0,0 @@
-load(default_post.prf)
-
-# It is important that this config be executed last,
-# and qmake does them in reverse order.
-CONFIG = symbian_building $$CONFIG
diff --git a/mkspecs/symbian/linux-gcce/qmake.conf b/mkspecs/symbian/linux-gcce/qmake.conf
deleted file mode 100644
index faac2f1..0000000
--- a/mkspecs/symbian/linux-gcce/qmake.conf
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# qmake configuration for symbian/linux-gcce
-#
-
-include(../../common/symbian/symbian-makefile.conf)
-
-include(../../common/g++.conf)
-
-QMAKE_CC		= arm-none-symbianelf-gcc
-QMAKE_CXX		= arm-none-symbianelf-g++
-QMAKE_LINK		= arm-none-symbianelf-ld
-QMAKE_LINK_SHLIB	= arm-none-symbianelf-ld
-QMAKE_LINK_C		= arm-none-symbianelf-ld
-QMAKE_LINK_C_SHLIB	= arm-none-symbianelf-ld
-QMAKE_AR		= arm-none-symbianelf-ar cqs
-
-# gcce defaults to 'arm' instruction set.  Lets use the better 'thumb' if possible
-# notice that the middle part of the following set of vars matches the TARGET content of the libs
-
-QMAKE_qtmain_CXXFLAGS	= -mthumb
-QMAKE_QtCore_CXXFLAGS	= -mthumb
-QMAKE_QtGui_LFLAGS	= -Ttext 0x8000 -Tdata 0xE00000
-QMAKE_QtDBus_CXXFLAGS	= -mthumb
-QMAKE_QtDeclarative_CXXFLAGS	= -mthumb
-QMAKE_QtMultimedia_CXXFLAGS	= -mthumb
-QMAKE_QtNetwork_CXXFLAGS	= -mthumb
-QMAKE_QtOpenGL_CXXFLAGS	= -mthumb
-QMAKE_QtOpenVG_CXXFLAGS	= -mthumb
-QMAKE_phonon_CXXFLAGS	= -mthumb
-QMAKE_QtScript_CXXFLAGS	= -mthumb
-QMAKE_QtScriptTools_CXXFLAGS	= -mthumb
-QMAKE_QtSql_CXXFLAGS	= -mthumb
-QMAKE_QtSvg_CXXFLAGS	= -mthumb
-QMAKE_QtTest_CXXFLAGS	= -mthumb
-QMAKE_QtXmlPatterns_CXXFLAGS	= -mthumb
-QMAKE_QtXml_CXXFLAGS	= -mthumb
-#TODO fails with; arm-none-symbianelf-ld: section .data loaded at [00e00000,00e05973] overlaps section .text loaded at [00008000,00fe748b]
-QMAKE_QtWebKit_LFLAGS	= -Ttext 0x8000 -Tdata 0xE00000
-
-# never use -fPIC, gcce-linker doesn't like it.
-# g++ conf above adds it if the host platform is 64 bit, so we remove it again
-QMAKE_CFLAGS_SHLIB	-= -fPIC
-QMAKE_CFLAGS_STATIC_LIB	-= -fPIC
-QMAKE_CXXFLAGS_SHLIB	-= -fPIC
-QMAKE_CXXFLAGS_STATIC_LIB	-= -fPIC
-
-QMAKE_LFLAGS_SONAME	=
-#QMAKE_LFLAGS_THREAD	+=
-#QMAKE_LFLAGS_NOUNDEF	+= -Wl,--no-undefined
-QMAKE_LFLAGS_RPATH	= --rpath=
-
-DEFINES		+= __GCCE__ \
-                   UNICODE \
-                   _STLP_NO_EXCEPTION_HEADER
-
-QMAKE_LFLAGS_APP        += --entry=_E32Startup -u _E32Startup
-QMAKE_LFLAGS_SHLIB      += --default-symver --entry _E32Dll
-QMAKE_LFLAGS_PLUGIN     += $$QMAKE_LFLAGS_SHLIB
-
-gcceExtraFlags = --include=${EPOCROOT}/epoc32/include/gcce/gcce.h -march=armv5t -mapcs -mthumb-interwork -nostdinc -c -msoft-float -T script
-QMAKE_CFLAGS += $${gcceExtraFlags}
-QMAKE_CXXFLAGS += $${gcceExtraFlags} -x c++ -fexceptions -fno-unit-at-a-time -fvisibility-inlines-hidden
-#If we are not going to link to Qt or qtmain.lib, we need to include this at least once.
-isEmpty(QT):contains(TEMPLATE, app) {
-    QMAKE_CXXFLAGS += --include=${EPOCROOT}/epoc32/include/stdapis/staticlibinit_gcce.h
-}
-
-QMAKE_LFLAGS += --target1-abs \
-                --no-undefined \
-                --nostdlib
-
-QMAKE_LIBDIR	+= ${EPOCROOT}/epoc32/release/armv5/udeb/
-
-# g++ knows the path to the gcc-shipped-libs, ld doesn't. So cache the full path in the generate Makefile
-QMAKE_GCC_SEARCH_DIRS =$$system($$QMAKE_CXX -print-search-dirs)
-for(line, QMAKE_GCC_SEARCH_DIRS) {
-    contains(line, "libraries:") {
-        foundIt="1"
-    } else {
-        contains(foundIt, "1") {
-            QMAKE_LFLAGS += $$replace(line, "[=:]", " -L")
-        }
-    }
-}
-
-QMAKE_LIBDIR += $${EPOCROOT}/epoc32/release/armv5/lib
-
-INCLUDEPATH = ${EPOCROOT}/epoc32/include/ \
-    $${EPOCROOT}/epoc32/include/variant \
-    $${EPOCROOT}/epoc32/include/stdapis \
-    $${EPOCROOT}/epoc32/include/gcce \
-    ${EPOCROOT}/epoc32/include/stdapis/sys \
-    ${EPOCROOT}/epoc32/include/stdapis/stlport \
-    $$INCLUDEPATH
-
diff --git a/mkspecs/symbian/linux-gcce/qplatformdefs.h b/mkspecs/symbian/linux-gcce/qplatformdefs.h
deleted file mode 100644
index fcbd9ea..0000000
--- a/mkspecs/symbian/linux-gcce/qplatformdefs.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the mkspecs 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 "../../common/symbian/qplatformdefs.h"
-