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

Conflicts:

	src/s60main/s60main.pro

1 files changed, 9 insertions, 9 deletions

diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index 0d2e05387b..248c83f8d9 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -1,7 +1,7 @@
-linux-armcc {
+symbian-armcc {
     QMAKE_CFLAGS += $$QMAKE_CFLAGS.ARMCC
     QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS.ARMCC
-} else:linux-gcce {
+} else:symbian-gcce {
     QMAKE_CFLAGS += $$QMAKE_CFLAGS.GCCE
     QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS.GCCE
 }
@@ -16,7 +16,7 @@ else:clean_TARGET = $$TARGET
 !contains(clean_TARGET, ".*[ -/].*"):eval(TMPVAR = \$\$QMAKE_$${clean_TARGET}_LFLAGS)
 !isEmpty(TMPVAR) {
     QMAKE_LFLAGS += $$TMPVAR
-} else :linux-gcce {  # lets provide a simple default. Without elf2e32 complains
+} else :symbian-gcce {  # lets provide a simple default. Without elf2e32 complains
     QMAKE_LFLAGS += -Ttext 0x80000 -Tdata 0x400000
 }
 
@@ -62,7 +62,7 @@ for(libToProcess, libsToProcess) {
         } else {
             qt_newLib = $$processSymbianLibrary($$qt_library)
             contains(qt_newLib, ".*\\.dso$")|contains(qt_newLib, ".*\\.lib$"):PRE_TARGETDEPS += $$qt_newLib
-            linux-gcce:qt_newLib = "-l:$$qt_newLib"
+            symbian-gcce:qt_newLib = "-l:$$qt_newLib"
             eval($$libToProcess += \$\$qt_newLib)
         }
     }
@@ -142,10 +142,10 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) {
     QMAKE_CLEAN += $${symbianObjdir}/$${baseTarget}.dso
     QMAKE_CLEAN += $${symbianObjdir}/$${baseTarget}.def
 
-    linux-armcc: {
+    symbian-armcc: {
         LIBS += usrt2_2.lib dfpaeabi.dso dfprvct2_2.dso drtaeabi.dso scppnwdl.dso drtrvct2_2.dso h_t__uf.l\\(switch8.o\\)
         LIBS += -ledllstub.lib -ledll.lib\\(uc_dll_.o\\)
-    } else :linux-gcce {
+    } else :symbian-gcce {
         LIBS += \
             -l:edllstub.lib \
             -l:edll.lib \
@@ -185,7 +185,7 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@:.*") {
     QMAKE_DISTCLEAN += $${symbianDestdir}/$${baseTarget}.exe
     QMAKE_CLEAN += $${symbianDestdir}/$${baseTarget}
 
-    linux-armcc: {
+    symbian-armcc: {
         QMAKE_LIBS += usrt2_2.lib dfpaeabi.dso dfprvct2_2.dso drtaeabi.dso scppnwdl.dso drtrvct2_2.dso h_t__uf.l\\(switch8.o\\)
         QMAKE_LIBS += -leexe.lib\\(uc_exe_.o\\)
         contains(CONFIG, "qt") {
@@ -195,7 +195,7 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@:.*") {
             QMAKE_LIBS -= $$QMAKE_LIBS_NO_QT_ENTRY
             QMAKE_LIBS += $$QMAKE_LIBS_NO_QT_ENTRY
         }
-    } else :linux-gcce {
+    } else :symbian-gcce {
         # notice that we can't merge these as ordering of arguments is important.
         QMAKE_LIBS += \
             -l:eexe.lib \
@@ -225,7 +225,7 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@:.*") {
 }
 
 # Symbian resource files
-linux-armcc: {
+symbian-armcc: {
     SYMBIAN_RVCT22INC=$$(RVCT22INC)
     !isEmpty(SYMBIAN_RVCT22INC):symbian_resources_INCLUDES = -I$${SYMBIAN_RVCT22INC}
 }