Remove S60/symbian specific mkspec
authorLiang Qi <liang.qi@nokia.com>
Mon, 31 Oct 2011 12:34:01 +0000 (13:34 +0100)
committerQt by Nokia <qt-info@nokia.com>
Tue, 1 Nov 2011 00:51:32 +0000 (01:51 +0100)
Clean up and remove Symbian specific mkspec.

Change-Id: I0fa75287720db92983422611e0090301d06814ec
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
44 files changed:
mkspecs/common/symbian/appCaptionForTranslation.cpp [deleted file]
mkspecs/common/symbian/header-wrappers/AknBitmapAnimation.h [deleted file]
mkspecs/common/symbian/header-wrappers/AknDoc.h [deleted file]
mkspecs/common/symbian/header-wrappers/AknFontAccess.h [deleted file]
mkspecs/common/symbian/header-wrappers/AknInputLanguageInfo.h [deleted file]
mkspecs/common/symbian/header-wrappers/AknLayoutFont.h [deleted file]
mkspecs/common/symbian/header-wrappers/AknPopupFader.h [deleted file]
mkspecs/common/symbian/header-wrappers/AknServerApp.h [deleted file]
mkspecs/common/symbian/header-wrappers/AknUtils.h [deleted file]
mkspecs/common/symbian/header-wrappers/AknsBasicBackgroundControlContext.h [deleted file]
mkspecs/common/symbian/header-wrappers/AknsConstants.h [deleted file]
mkspecs/common/symbian/header-wrappers/AknsDrawUtils.h [deleted file]
mkspecs/common/symbian/header-wrappers/AknsItemID.h [deleted file]
mkspecs/common/symbian/header-wrappers/AknsSkinInstance.h [deleted file]
mkspecs/common/symbian/header-wrappers/AknsUtils.h [deleted file]
mkspecs/common/symbian/header-wrappers/ApAccessPointItem.h [deleted file]
mkspecs/common/symbian/header-wrappers/ApDataHandler.h [deleted file]
mkspecs/common/symbian/header-wrappers/ApUtils.h [deleted file]
mkspecs/common/symbian/header-wrappers/CDirectoryLocalizer.h [deleted file]
mkspecs/common/symbian/header-wrappers/DocumentHandler.h [deleted file]
mkspecs/common/symbian/packageNameForTranslation.cpp [deleted file]
mkspecs/common/symbian/qplatformdefs.h [deleted file]
mkspecs/common/symbian/stl-off/new [deleted file]
mkspecs/common/symbian/symbian-makefile.conf [deleted file]
mkspecs/common/symbian/symbian-mmp.conf [deleted file]
mkspecs/common/symbian/symbian.conf [deleted file]
mkspecs/common/symbian/symbianincludes.h [deleted file]
mkspecs/common/symbian/template.applite [deleted file]
mkspecs/symbian-abld/qmake.conf [deleted file]
mkspecs/symbian-abld/qplatformdefs.h [deleted file]
mkspecs/symbian-armcc/features/default_post.prf [deleted file]
mkspecs/symbian-armcc/qmake.conf [deleted file]
mkspecs/symbian-armcc/qplatformdefs.h [deleted file]
mkspecs/symbian-gcce/features/default_post.prf [deleted file]
mkspecs/symbian-gcce/qmake.conf [deleted file]
mkspecs/symbian-gcce/qplatformdefs.h [deleted file]
mkspecs/symbian-sbsv2/flm/qt/qmake_clean.flm [deleted file]
mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm [deleted file]
mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm [deleted file]
mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm [deleted file]
mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm [deleted file]
mkspecs/symbian-sbsv2/flm/qt/qt.xml [deleted file]
mkspecs/symbian-sbsv2/qmake.conf [deleted file]
mkspecs/symbian-sbsv2/qplatformdefs.h [deleted file]

diff --git a/mkspecs/common/symbian/appCaptionForTranslation.cpp b/mkspecs/common/symbian/appCaptionForTranslation.cpp
deleted file mode 100644 (file)
index d59301a..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 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$
-** 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$
-**
-****************************************************************************/
-
-//: Application short caption, currently only relevant for application projects in Symbian.
-QT_TRANSLATE_NOOP("QtApplicationCaptions", "Application short caption")
-
-//: Application long caption, currently only relevant for application projects in Symbian.
-QT_TRANSLATE_NOOP("QtApplicationCaptions", "Application long caption")
diff --git a/mkspecs/common/symbian/header-wrappers/AknBitmapAnimation.h b/mkspecs/common/symbian/header-wrappers/AknBitmapAnimation.h
deleted file mode 100644 (file)
index d53605e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <aknbitmapanimation.h>
diff --git a/mkspecs/common/symbian/header-wrappers/AknDoc.h b/mkspecs/common/symbian/header-wrappers/AknDoc.h
deleted file mode 100644 (file)
index d4dbd7d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <akndoc.h>
diff --git a/mkspecs/common/symbian/header-wrappers/AknFontAccess.h b/mkspecs/common/symbian/header-wrappers/AknFontAccess.h
deleted file mode 100644 (file)
index e33baaf..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <aknfontaccess.h>
diff --git a/mkspecs/common/symbian/header-wrappers/AknInputLanguageInfo.h b/mkspecs/common/symbian/header-wrappers/AknInputLanguageInfo.h
deleted file mode 100644 (file)
index 5f993d7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <akninputlanguageinfo.h>
diff --git a/mkspecs/common/symbian/header-wrappers/AknLayoutFont.h b/mkspecs/common/symbian/header-wrappers/AknLayoutFont.h
deleted file mode 100644 (file)
index b5954e1..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <aknlayoutfont.h>
-
diff --git a/mkspecs/common/symbian/header-wrappers/AknPopupFader.h b/mkspecs/common/symbian/header-wrappers/AknPopupFader.h
deleted file mode 100644 (file)
index 60a007a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <aknpopupfader.h>
diff --git a/mkspecs/common/symbian/header-wrappers/AknServerApp.h b/mkspecs/common/symbian/header-wrappers/AknServerApp.h
deleted file mode 100644 (file)
index b4dc69f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <aknserverapp.h>
diff --git a/mkspecs/common/symbian/header-wrappers/AknUtils.h b/mkspecs/common/symbian/header-wrappers/AknUtils.h
deleted file mode 100644 (file)
index 66a3784..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <aknutils.h>
diff --git a/mkspecs/common/symbian/header-wrappers/AknsBasicBackgroundControlContext.h b/mkspecs/common/symbian/header-wrappers/AknsBasicBackgroundControlContext.h
deleted file mode 100644 (file)
index d121122..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <aknsbasicbackgroundcontrolcontext.h>
diff --git a/mkspecs/common/symbian/header-wrappers/AknsConstants.h b/mkspecs/common/symbian/header-wrappers/AknsConstants.h
deleted file mode 100644 (file)
index c262866..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <aknsconstants.h>
diff --git a/mkspecs/common/symbian/header-wrappers/AknsDrawUtils.h b/mkspecs/common/symbian/header-wrappers/AknsDrawUtils.h
deleted file mode 100644 (file)
index 7d71624..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <aknsdrawutils.h>
diff --git a/mkspecs/common/symbian/header-wrappers/AknsItemID.h b/mkspecs/common/symbian/header-wrappers/AknsItemID.h
deleted file mode 100644 (file)
index fe3b80e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <aknsitemid.h>
diff --git a/mkspecs/common/symbian/header-wrappers/AknsSkinInstance.h b/mkspecs/common/symbian/header-wrappers/AknsSkinInstance.h
deleted file mode 100644 (file)
index 4a9dcd8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <aknsskininstance.h>
diff --git a/mkspecs/common/symbian/header-wrappers/AknsUtils.h b/mkspecs/common/symbian/header-wrappers/AknsUtils.h
deleted file mode 100644 (file)
index 1b9bece..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <aknsutils.h>
diff --git a/mkspecs/common/symbian/header-wrappers/ApAccessPointItem.h b/mkspecs/common/symbian/header-wrappers/ApAccessPointItem.h
deleted file mode 100644 (file)
index 75b6c69..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <apaccesspointitem.h>
diff --git a/mkspecs/common/symbian/header-wrappers/ApDataHandler.h b/mkspecs/common/symbian/header-wrappers/ApDataHandler.h
deleted file mode 100644 (file)
index b7b972d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <apdatahandler.h>
diff --git a/mkspecs/common/symbian/header-wrappers/ApUtils.h b/mkspecs/common/symbian/header-wrappers/ApUtils.h
deleted file mode 100644 (file)
index 09cedce..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <aputils.h>
diff --git a/mkspecs/common/symbian/header-wrappers/CDirectoryLocalizer.h b/mkspecs/common/symbian/header-wrappers/CDirectoryLocalizer.h
deleted file mode 100644 (file)
index f251302..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <cdirectorylocalizer.h>
diff --git a/mkspecs/common/symbian/header-wrappers/DocumentHandler.h b/mkspecs/common/symbian/header-wrappers/DocumentHandler.h
deleted file mode 100644 (file)
index 8981af6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <documenthandler.h>
diff --git a/mkspecs/common/symbian/packageNameForTranslation.cpp b/mkspecs/common/symbian/packageNameForTranslation.cpp
deleted file mode 100644 (file)
index d7bbda5..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 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$
-** 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$
-**
-****************************************************************************/
-
-//: Installation package name, currently only relevant for Symbian projects that deploy something.
-QT_TRANSLATE_NOOP("QtPackageNames", "Package name")
-
-//: Smart installer installation package name, currently only relevant for Symbian projects that
-//: deploy something.
-QT_TRANSLATE_NOOP("QtPackageNames", "Smart installer package name")
diff --git a/mkspecs/common/symbian/qplatformdefs.h b/mkspecs/common/symbian/qplatformdefs.h
deleted file mode 100644 (file)
index 612e970..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 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$
-** 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$
-**
-****************************************************************************/
-
-#ifndef QPLATFORMDEFS_H
-#define QPLATFORMDEFS_H
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
-#endif
-
-#include <unistd.h>
-
-
-// We are hot - unistd.h should have turned on the specific APIs we requested
-
-//#include <features.h>
-#include <pthread.h>
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-//#include <signal.h>
-#include <dlfcn.h>
-#include <sys/select.h>
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/ipc.h>
-#include <sys/time.h>
-#include <sys/shm.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <netinet/in.h>
-#ifndef QT_NO_IPV6IFNAME
-#include <net/if.h>
-#endif
-#include <arpa/inet.h>
-
-#define QT_USE_XOPEN_LFS_EXTENSIONS
-// unset large file as symbian doesn't support it
-#undef QT_LARGEFILE_SUPPORT
-#include "../posix/qplatformdefs.h"
-
-#undef QT_OPEN_LARGEFILE
-#undef QT_SOCKLEN_T
-
-#define QT_OPEN_LARGEFILE       0
-
-#if (defined(__GLIBC__) && (__GLIBC__ >= 2)) || defined(Q_OS_SYMBIAN)
-#define QT_SOCKLEN_T            socklen_t
-#else
-#define QT_SOCKLEN_T            int
-#endif
-
-#if defined(__ISO_C_VISIBLE) && (__ISO_C_VISIBLE >= 1999)
-#define QT_SNPRINTF     ::snprintf
-#define QT_VSNPRINTF    ::vsnprintf
-#endif
-
-#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/common/symbian/stl-off/new b/mkspecs/common/symbian/stl-off/new
deleted file mode 100644 (file)
index 8584ba3..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-// 'new' implemented in symbian libs, so do nothing here; just keep Qt happy
-#ifndef __NEW_SYMB_ADDON
-#define __NEW_SYMB_ADDON
-#include <e32base.h>
-#endif //__NEW_SYMB_ADDON 
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf
deleted file mode 100644 (file)
index a725df3..0000000
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# qmake configuration for makefile based symbian
-#
-
-contains(QMAKE_HOST.os,Windows) {
-    MAKEFILE_GENERATOR = SYMBIAN_MINGW
-} else {
-    MAKEFILE_GENERATOR = SYMBIAN_UNIX
-}
-
-include(symbian.conf)
-
-QMAKE_INCDIR_OPENGL   = $${EPOCROOT}epoc32/include
-QMAKE_LIBDIR_OPENGL   = $${EPOCROOT}epoc32/release/armv5/lib
-QMAKE_INCDIR_OPENGL_ES1 = $${EPOCROOT}epoc32/include/GLES
-QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
-QMAKE_INCDIR_OPENGL_ES2 = $${EPOCROOT}epoc32/include/GLES2
-QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
-QMAKE_INCDIR_EGL      = $${EPOCROOT}epoc32/include/EGL
-QMAKE_LIBDIR_EGL      = $$QMAKE_LIBDIR_OPENGL
-QMAKE_INCDIR_OPENVG   = $${EPOCROOT}epoc32/include/VG
-QMAKE_LIBDIR_OPENVG   = $$QMAKE_LIBDIR_OPENGL
-
-QMAKE_LIBDIR_QT         = $$[QT_INSTALL_LIBS]
-
-QMAKE_RUN_CC           = $(CC) -c $(CFLAGS) $(INCPATH) -o $obj $src
-QMAKE_RUN_CC_IMP       = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $<
-QMAKE_RUN_CXX          = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
-QMAKE_RUN_CXX_IMP      = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
-
-QMAKE_ELF2E32_FLAGS    = --dlldata \
-                          --fpu=softvfp \
-                          --unfrozen \
-                          --compressionmethod bytepair \
-                          --unpaged
-
-QMAKE_PREFIX_SHLIB    =
-CONFIG *= no_plugin_name_prefix
-QMAKE_PREFIX_STATICLIB =
-QMAKE_SYMBIAN_SHLIB   = 1
-
-QMAKE_LINK_OBJECT_SCRIPT = objects
-
-is_using_gnupoc {
-    DEFINES *= __QT_PRODUCT_INCLUDE_IS_LOWERCASE__
-}
-QMAKE_SYMBIAN_INCLUDES = $$IN_PWD/symbianincludes.h
-symbian-armcc {
-    QMAKE_CFLAGS += --preinclude $$QMAKE_SYMBIAN_INCLUDES
-    QMAKE_CXXFLAGS += --preinclude $$QMAKE_SYMBIAN_INCLUDES
-} else:symbian-gcce {
-    QMAKE_CFLAGS += -include $$QMAKE_SYMBIAN_INCLUDES
-    QMAKE_CXXFLAGS += -include $$QMAKE_SYMBIAN_INCLUDES
-}
-DEFINES *= \
-    __SYMBIAN32__ \
-    __MARM_INTERWORK__ \
-    _UNICODE \
-    __S60_50__ \
-    __S60_3X__ \
-    __SERIES60_3X__ \
-    __EPOC32__ \
-    __MARM__ \
-    __EABI__ \
-    __MARM_ARMV5__ \
-    __SUPPORT_CPP_EXCEPTIONS__
-
-QMAKE_CFLAGS_DEBUG      += -g
-QMAKE_CXXFLAGS_DEBUG    += -g
-QMAKE_CFLAGS_RELEASE    += -O2 -Otime
-QMAKE_CXXFLAGS_RELEASE  += -O2 -Otime
-
diff --git a/mkspecs/common/symbian/symbian-mmp.conf b/mkspecs/common/symbian/symbian-mmp.conf
deleted file mode 100644 (file)
index 8ed326a..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# qmake configuration for symbian-*
-#
-
-include(symbian.conf)
-
-load(symbian/add_mmp_rules)
-
-symbian-abld {
-# Versions of abld prior to Symbian^3 have a bug where you cannot remove something from the command line without replacing it
-# Rather than figure out which version of abld we're using, we'll replace the command with a macro *that should never be used*
-    MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA = "OPTION_REPLACE ARMCC --export_all_vtbl -D__QT_NOEFFECTMACRO_DONOTUSE"
-} else {
-    MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA = "OPTION_REPLACE ARMCC --export_all_vtbl // don't use --export_all_vtbl"
-}
-MMP_RULES += BYTEPAIRCOMPRESSTARGET
-MMP_RULES += $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA
-SYMBIAN_PLATFORMS = WINSCW GCCE ARMV5 ARMV6
-
-INCLUDEPATH = \
-    $$[QT_INSTALL_DATA]/mkspecs/common/symbian/stl-off \
-    $$[QT_INSTALL_DATA]/mkspecs/common/symbian \
-    $${EPOCROOT}epoc32/include \
-    $$OS_LAYER_LIBC_SYSTEMINCLUDE \
-    $$INCLUDEPATH
-
-# Ensure '.' directory is the first in include path.
-# RVCT seems to do this automatically, but WINSCW compiler does not, so add it here.
-MMP_RULES += "USERINCLUDE ."
-
-# S60 3.1 devices don't support paging for non-ROM components, so no point in using the less efficient compression mechanism
-contains(S60_VERSION, 3.1):MMP_RULES -= BYTEPAIRCOMPRESSTARGET
-
-QMAKE_CXXFLAGS_FAST_VFP.ARMCC = --fpmode fast
-# [TODO] QMAKE_CXXFLAGS_FAST_VFP.GCCE =
-
-symbian {
-    armfpu = $$find(MMP_RULES, "ARMFPU")
-    !isEmpty(armfpu) {
-        vfpv2 = $$find(MMP_RULES, "vfpv2")
-        !isEmpty(vfpv2) {
-            # we will respect fpu setting obtained from configure, but,
-            # if vfpv2 or softvfp+vfpv2 used we want to force RunFast VFP mode
-            QMAKE_CXXFLAGS.ARMCC += $${QMAKE_CXXFLAGS_FAST_VFP.ARMCC}
-            # [TODO] QMAKE_CXXFLAGS.GCCE += $${QMAKE_CXXFLAGS_FAST_VFP.GCCE}
-        }
-    }
-}
-
-# Variables for replacing equivalent QMAKE_* variables in bld.inf for FLM execution of commands
-symbian-sbsv2 {
-    QMAKE_SBSV2_COPY           = $(GNUCP)
-    QMAKE_SBSV2_COPY_DIR       = $(GNUCP) -r
-    QMAKE_SBSV2_MOVE           = $(GNUMV)
-    QMAKE_SBSV2_DEL_FILE       = $(GNURM) -f
-    QMAKE_SBSV2_MKDIR          = $(GNUMKDIR)
-    QMAKE_SBSV2_DEL_DIR        = $(GNURMDIR)
-    QMAKE_SBSV2_DEL_TREE       = $(GNURM) -rf
-}
-
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
deleted file mode 100644 (file)
index 5bf8728..0000000
+++ /dev/null
@@ -1,297 +0,0 @@
-#
-# qmake configuration for all symbian mkspecs
-#
-
-TEMPLATE               = app
-CONFIG                 += prepend_includepath qt warn_on release incremental link_prl sis_targets run_on_phone
-QT                     += core gui
-QMAKE_INCREMENTAL_STYLE = sublib
-
-DEFINES                        += UNICODE QT_KEYPAD_NAVIGATION QT_SOFTKEYS_ENABLED QT_USE_MATH_H_FLOATS
-
-QMAKE_COMPILER_DEFINES  += SYMBIAN
-
-QMAKE_EXT_OBJ           = .o
-QMAKE_EXT_RES           = _res.o
-QMAKE_EXTENSION_SHLIB   = dll
-QMAKE_EXTENSION_PLUGIN  = dll
-QMAKE_EXTENSION_STATICLIB = lib
-
-QMAKE_LEX              = flex
-QMAKE_LEXFLAGS         =
-QMAKE_YACC             = byacc
-QMAKE_YACCFLAGS                = -d
-QMAKE_CFLAGS           =
-QMAKE_CFLAGS_DEPS      =
-QMAKE_CFLAGS_WARN_ON   =
-QMAKE_CFLAGS_WARN_OFF  =
-QMAKE_CFLAGS_RELEASE   =
-QMAKE_CFLAGS_DEBUG     =
-QMAKE_CFLAGS_YACC      = -Wno-unused -Wno-parentheses
-
-MMP_OPTION_KEYWORDS = CW ARMCC GCCE
-VERSION_FLAGS.ARMCC = ARMCC_4
-QMAKE_CXXFLAGS         = $$QMAKE_CFLAGS
-# Symbian build system applies -cwd source on the MWCC command line.
-# this causes problems with include paths, -cwd include uses the same
-# rules for include paths as ARMCC
-# This should really be fixed in raptor, as using CXXFLAGS means we pass
-# both on the command line and rely on the compiler using the last specified
-QMAKE_CXXFLAGS.CW      = -cwd include
-QMAKE_CXXFLAGS.ARMCC      = --visibility_inlines_hidden
-QMAKE_CXXFLAGS.ARMCC_4  = --import_all_vtbl
-QMAKE_CXXFLAGS.GCCE    = -fvisibility-inlines-hidden
-QMAKE_CXXFLAGS_DEPS    = $$QMAKE_CFLAGS_DEPS
-QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
-QMAKE_CXXFLAGS_WARN_OFF        = $$QMAKE_CFLAGS_WARN_OFF
-QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
-QMAKE_CXXFLAGS_DEBUG   = $$QMAKE_CFLAGS_DEBUG
-QMAKE_CXXFLAGS_YACC    = $$QMAKE_CFLAGS_YACC
-QMAKE_CXXFLAGS_THREAD  = $$QMAKE_CFLAGS_THREAD
-QMAKE_CXXFLAGS_RTTI_ON =
-QMAKE_CXXFLAGS_RTTI_OFF        =
-QMAKE_CXXFLAGS_EXCEPTIONS_ON =
-QMAKE_CXXFLAGS_EXCEPTIONS_OFF =
-
-QMAKE_INCDIR           =
-QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
-
-QMAKE_LFLAGS            =
-QMAKE_LFLAGS.ARMCC      =
-QMAKE_LFLAGS.GCCE       =
-QMAKE_LFLAGS_EXCEPTIONS_ON =
-QMAKE_LFLAGS_EXCEPTIONS_OFF =
-QMAKE_LFLAGS_RELEASE    =
-QMAKE_LFLAGS_DEBUG      =
-QMAKE_LFLAGS_CONSOLE    =
-QMAKE_LFLAGS_WINDOWS    =
-QMAKE_LFLAGS_DLL        =
-QMAKE_LINK_OBJECT_MAX   =
-QMAKE_LINK_OBJECT_SCRIPT=
-
-QMAKE_LIBS             = -llibc -llibm -leuser -llibdl
-QMAKE_LIBS_CORE         = $$QMAKE_LIBS -lefsrv -lhal -lbafl -lapparc
-QMAKE_LIBS_CFBSBITMAP   = -lfbscli -lbitgdi -lgdi
-QMAKE_LIBS_GUI          = $$QMAKE_LIBS_CORE $$QMAKE_LIBS_CFBSBITMAP -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -lcentralrepository
-QMAKE_LIBS_NETWORK      = 
-QMAKE_LIBS_EGL          = -llibEGL
-QMAKE_LIBS_OPENGL       = -llibGLESv2
-QMAKE_LIBS_OPENGL_ES1   = -llibGLESv1_CM
-QMAKE_LIBS_OPENGL_ES2   = -llibGLESv2
-QMAKE_LIBS_OPENGL_QT     = $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_CFBSBITMAP -lcone -lws32
-QMAKE_LIBS_OPENGL_ES1_QT = $$QMAKE_LIBS_OPENGL_ES1 $$QMAKE_LIBS_CFBSBITMAP -lcone -lws32
-QMAKE_LIBS_OPENGL_ES2_QT = $$QMAKE_LIBS_OPENGL_ES2 $$QMAKE_LIBS_CFBSBITMAP -lcone -lws32
-QMAKE_LIBS_OPENVG       = $$QMAKE_LIBS_CFBSBITMAP -llibOpenVG
-QMAKE_LIBS_THREAD       = -llibpthread
-QMAKE_LIBS_COMPAT       = 
-QMAKE_LIBS_S60          = -lavkon -leikcoctl -lgfxtrans
-
-exists($${EPOCROOT}epoc32/include/platform/sgresource/sgimage.h) {
-    QMAKE_LIBS_OPENVG += -lsgresource
-}
-
-contains(QMAKE_HOST.os,Windows) {
-    QMAKE_COPY           = copy /y
-    QMAKE_COPY_DIR       = xcopy /s /q /y /i
-    QMAKE_MOVE           = move
-    QMAKE_DEL_FILE       = del /q 2> NUL
-    QMAKE_MKDIR          = mkdir
-    QMAKE_DEL_DIR        = rmdir
-    QMAKE_DEL_TREE       = rmdir /s /q
-    QMAKE_CHK_DIR_EXISTS = if not exist
-
-    QMAKE_MOC            = $$[QT_INSTALL_BINS]\\moc.exe
-    QMAKE_UIC            = $$[QT_INSTALL_BINS]\\uic.exe
-    QMAKE_IDC            = $$[QT_INSTALL_BINS]\\idc.exe
-} else {
-    QMAKE_COPY           = cp
-    QMAKE_COPY_DIR       = cp -r
-    QMAKE_MOVE           = mv
-    QMAKE_DEL_FILE       = rm -f
-    QMAKE_MKDIR          = mkdir -p
-    QMAKE_DEL_DIR        = rmdir
-    QMAKE_DEL_TREE       = rm -rf
-    QMAKE_CHK_DIR_EXISTS = test -d
-
-    QMAKE_MOC            = $$[QT_INSTALL_BINS]/moc
-    QMAKE_UIC            = $$[QT_INSTALL_BINS]/uic
-    QMAKE_IDC            = $$[QT_INSTALL_BINS]/idc
-}
-
-QMAKE_IDL                = midl
-QMAKE_ZIP                = zip -r -9
-QMAKE_UNZIP               = unzip -o
-
-QMAKE_WRITE_DEFAULT_RC    = 1
-
-QMAKE_TAR                 = tar -cf
-QMAKE_GZIP                = gzip -9f
-
-QT_ARCH               = symbian
-
-load(qt_config)
-
-QMAKE_LIBS_QT_ENTRY     = -lqtmain$${QT_LIBINFIX}.lib
-QMAKE_LIBS_NO_QT_ENTRY  = -llibcrt0.lib
-QMAKE_LIBS_NO_QT_ENTRY_GCCE  = -llibcrt0_gcce.lib
-
-# List of languages that have a Symbian language code mapping provided in localize_deployment.prf
-SYMBIAN_SUPPORTED_LANGUAGES = \
-    af sq am ar hy bn bg my be ca \
-    hr cs da nl en et fi fr gd ka \
-    de el gu he hi hu is id ga it \
-    ja kn kk ko lo lv lt mk ms ml \
-    mr mo mn nb pl pt pa ro ru sr \
-    si sk sl so es sw sv tl ta te \
-    th bo ti tr tk uk ur vi cy zu \
-    nn eu zh gl fa st en_US fr_BE \
-    pt_BR en_CA fr_CA el_CY tr_CY \
-    en_TW en_HK en_CN en_JP en_TH \
-    sv_FI zh_HK es_419 en_ZA fr_CH \
-    de_CH it_CH zh_TW
-
-# These directories must match what configure uses for QT_INSTALL_PLUGINS and QT_INSTALL_IMPORTS
-QT_PLUGINS_BASE_DIR = /resource/qt$${QT_LIBINFIX}/plugins
-QT_IMPORTS_BASE_DIR = /resource/qt$${QT_LIBINFIX}/imports
-
-load(symbian/platform_paths)
-
-# If environment.prf is provided by platform, load that.
-# It is used for platform specific variable settings, such as SYMBIAN_VERSION.
-exists($${EPOCROOT}epoc32/tools/qt/mkspecs/features/environment.prf) {
-    load($${EPOCROOT}epoc32/tools/qt/mkspecs/features/environment.prf)
-}
-
-# Try to detect SDK version if it wasn't set by environment.prf
-isEmpty(SYMBIAN_VERSION)|isEmpty(S60_VERSION) {
-    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.4.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.4.sis) {
-        isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = 5.4
-        isEmpty(S60_VERSION): S60_VERSION = 5.4
-    } else {
-        exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.3.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.3.sis) {
-            isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = 5.3
-            isEmpty(S60_VERSION): S60_VERSION = 5.3
-        } else {
-            # The Symbian^3 PDK does not necessarily contain the required sis files.
-            # However, libstdcppv5 first appeared in Symbian^3 (S60 5.2), so check for that too.
-            exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcppv5.dso) {
-                isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = Symbian3
-                isEmpty(S60_VERSION): S60_VERSION = 5.2
-            } else {
-                exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.1.sis) {
-                    isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = Symbian2
-                    isEmpty(S60_VERSION): S60_VERSION = 5.1
-                } else {
-                    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.0.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.0.sis) {
-                        isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = 9.4
-                        isEmpty(S60_VERSION): S60_VERSION = 5.0
-                    } else {
-                        exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.2.sis) {
-                            isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = 9.3
-                            isEmpty(S60_VERSION): S60_VERSION = 3.2
-                        } else {
-                            exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v3.1.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v3.1.sis) {
-                                isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = 9.2
-                                isEmpty(S60_VERSION): S60_VERSION = 3.1
-                            } else {
-                                isEmpty(SYMBIAN_VERSION): SYMBIAN_VERSION = Unknown
-                                isEmpty(S60_VERSION): S60_VERSION = Unknown
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-# pkg_depends_webkit, pkg_depends_core, and pkg_platform_dependencies can be removed by developer
-# if multiple languages need to be supported by pkg file. In that case the developer should declare
-# multiple language compatible dependency statements him/herself.
-
-default_deployment.pkg_prerules += pkg_depends_webkit pkg_depends_qt pkg_platform_dependencies
-DEPLOYMENT += default_deployment default_bin_deployment default_resource_deployment default_reg_deployment
-
-defineReplace(symbianRemoveSpecialCharacters) {
-    # Produce identical string to what SymbianCommonGenerator::removeSpecialCharacters
-
-    fixedStr = $$1
-
-    fixedStr = $$replace(fixedStr, /,_)
-    fixedStr = $$replace(fixedStr, \\\\,_)
-    fixedStr = $$replace(fixedStr, " ",_)
-    fixedStr = $$replace(fixedStr, :,_)
-
-    return ($$fixedStr)
-}
-
-# Determines translations that are Symbian supported
-defineTest(matchSymbianLanguages) {
-    # Qt language codes for which we need to parse .ts file
-    SYMBIAN_MATCHED_LANGUAGES =
-    # List of translation files for matched languages
-    SYMBIAN_MATCHED_TRANSLATIONS =
-    # List of Qt language codes for which we have no mapped Symbian code but we have a fallback code
-    # and therefore need to generate a mapping for in localize_deployment.prf.
-    # The fallback code means plain language code for languages that have both language and country codes.
-    # E.g. the fallback code for language "zh_CN" would be "zh".
-    SYMBIAN_UNMAPPED_LANGUAGES =
-    # List of handled Qt language codes to avoid duplicate Symbian language codes in case both
-    # unmapped language+country combination and its fallback code, or multiple unmapped language+country
-    # combinations that have same fallback code are included.
-    HANDLED_LANGUAGES =
-
-    # Cannot parse .ts file for language here, so detect it from filename.
-    # Allow two and three character language and country codes.
-    for(translation, TRANSLATIONS) {
-        language = $$replace(translation, "^(.*/)?[^/]+_(([^_]{2,3}_)?[^_]{2,3})\\.ts$", \\2)
-        !contains(HANDLED_LANGUAGES, $$language) {
-            HANDLED_LANGUAGES += $$language
-            # Make sure translation path is absolute or shadow builds will not work
-            !contains(translation, "(^/|^\\\\|^.:).*"): translation = $$_PRO_FILE_PWD_/$$translation
-
-            contains(SYMBIAN_SUPPORTED_LANGUAGES, $$language) {
-                SYMBIAN_MATCHED_LANGUAGES += $$language
-                SYMBIAN_MATCHED_TRANSLATIONS += $$translation
-            } else {
-                # No direct mapping for specified language found. Check if a fallback language code can be used.
-                strippedLanguage = $$replace(language, "_.*$",)
-                contains(SYMBIAN_SUPPORTED_LANGUAGES, $$strippedLanguage):!contains(HANDLED_LANGUAGES, $$strippedLanguage) {
-                    HANDLED_LANGUAGES += $$strippedLanguage
-                    SYMBIAN_UNMAPPED_LANGUAGES += $$language
-                    SYMBIAN_MATCHED_LANGUAGES += $$language
-                    SYMBIAN_MATCHED_TRANSLATIONS += $$translation
-                    SYMBIAN_LANGUAGE_FALLBACK.$$language = $$strippedLanguage
-                    export(SYMBIAN_LANGUAGE_FALLBACK.$$language)
-                }
-            }
-        }
-    }
-
-    isEmpty(SYMBIAN_MATCHED_LANGUAGES): SYMBIAN_MATCHED_LANGUAGES = en
-
-    export(SYMBIAN_MATCHED_LANGUAGES)
-    export(SYMBIAN_MATCHED_TRANSLATIONS)
-    export(SYMBIAN_UNMAPPED_LANGUAGES)
-}
-
-# Symbian pkg files that define multiple languages require a language specific string to be
-# defined for various items, even though the string often needs to be same for all languages.
-# This replacement method will generate correct string for such cases based on TRANSLATIONS
-# variable.
-defineReplace(addLanguageDependentPkgItem) {
-    localize_deployment:!isEmpty(TRANSLATIONS):isEmpty(SYMBIAN_MATCHED_LANGUAGES) {
-        matchSymbianLanguages()
-    }
-
-    pkgItem = $$eval($$1)
-    pkgLanguageList =
-
-    for(dummyItem, SYMBIAN_MATCHED_LANGUAGES) {
-        pkgLanguageList += "\"$$pkgItem\""
-    }
-
-    isEmpty(pkgLanguageList): pkgLanguageList = "\"$$pkgItem\""
-
-    return($$join(pkgLanguageList,",",,))
-}
diff --git a/mkspecs/common/symbian/symbianincludes.h b/mkspecs/common/symbian/symbianincludes.h
deleted file mode 100644 (file)
index b4fb1e2..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 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$
-** 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$
-**
-****************************************************************************/
-
-#ifndef __PRODUCT_INCLUDE__
-#  ifdef __QT_PRODUCT_INCLUDE_IS_LOWERCASE__
-#    define __PRODUCT_INCLUDE__ <variant/symbian_os.hrh>
-#  else
-#    define __PRODUCT_INCLUDE__ <variant/Symbian_OS.hrh>
-#  endif
-#endif
-
-#ifndef __QT_SYMBIAN_RESOURCE__
-#  if defined(__ARMCC__) || defined(__CC_ARM)
-#    ifdef __QT_RVCT_HEADER_IS_2_2__
-#      include <rvct2_2.h>
-#    else
-#      include <rvct.h>
-#    endif
-#  endif
-#endif
diff --git a/mkspecs/common/symbian/template.applite b/mkspecs/common/symbian/template.applite
deleted file mode 100644 (file)
index 73a1999..0000000
+++ /dev/null
@@ -1 +0,0 @@
-// This is an auto-generated lite registration file
\ No newline at end of file
diff --git a/mkspecs/symbian-abld/qmake.conf b/mkspecs/symbian-abld/qmake.conf
deleted file mode 100644 (file)
index fe9cd60..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# qmake configuration for symbian-abld
-#
-# Written for SYMBIAN_ABLD
-#
-
-MAKEFILE_GENERATOR     = SYMBIAN_ABLD
-option(recursive)
-
-include(../common/symbian/symbian-mmp.conf)
diff --git a/mkspecs/symbian-abld/qplatformdefs.h b/mkspecs/symbian-abld/qplatformdefs.h
deleted file mode 100644 (file)
index ffca5c9..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 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$
-** 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 "../common/symbian/qplatformdefs.h"
-
diff --git a/mkspecs/symbian-armcc/features/default_post.prf b/mkspecs/symbian-armcc/features/default_post.prf
deleted file mode 100644 (file)
index 7aa1f4d..0000000
+++ /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-armcc/qmake.conf b/mkspecs/symbian-armcc/qmake.conf
deleted file mode 100644 (file)
index 2de3218..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-# qmake configuration for symbian-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
-    DEFINES *= __QT_RVCT_HEADER_IS_2_2__
-} else {
-    INCLUDEPATH += $${EPOCROOT}epoc32/include/rvct
-}
diff --git a/mkspecs/symbian-armcc/qplatformdefs.h b/mkspecs/symbian-armcc/qplatformdefs.h
deleted file mode 100644 (file)
index 2037e63..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 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$
-** 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 "../common/symbian/qplatformdefs.h"
diff --git a/mkspecs/symbian-gcce/features/default_post.prf b/mkspecs/symbian-gcce/features/default_post.prf
deleted file mode 100644 (file)
index 7aa1f4d..0000000
+++ /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-gcce/qmake.conf b/mkspecs/symbian-gcce/qmake.conf
deleted file mode 100644 (file)
index 17b1c5f..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# qmake configuration for symbian-gcce
-#
-
-include(../common/symbian/symbian-makefile.conf)
-
-include(../common/g++-unix.conf)
-include(../common/gcc-base-unix.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
-#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   =
-QMAKE_LFLAGS_RPATH     = --rpath=
-
-DEFINES                += __GCCE__ \
-                   UNICODE
-
-QMAKE_LFLAGS_APP        += --entry=_E32Startup -u _E32Startup
-QMAKE_LFLAGS_SHLIB      += -shared --default-symver --entry=_E32Dll -u _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 -Os
-#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)
-QMAKE_GCC_SEARCH_DIRS = "$$join(QMAKE_GCC_SEARCH_DIRS, " ")"
-QMAKE_GCC_SEARCH_DIRS = $$replace(QMAKE_GCC_SEARCH_DIRS, ".*libraries: *", "")
-QMAKE_GCC_SEARCH_DIRS = $$replace(QMAKE_GCC_SEARCH_DIRS, "=", "")
-contains(QMAKE_HOST.os,Windows) {
-    QMAKE_GCC_SEARCH_DIRS = $$split(QMAKE_GCC_SEARCH_DIRS, ;)
-} else {
-    QMAKE_GCC_SEARCH_DIRS = $$split(QMAKE_GCC_SEARCH_DIRS, :)
-}
-for(line, QMAKE_GCC_SEARCH_DIRS):QMAKE_LIBDIR += $$line
-
-QMAKE_LIBDIR += $${EPOCROOT}epoc32/release/armv5/lib
-
-INCLUDEPATH = $${EPOCROOT}epoc32/include/ \
-    $${EPOCROOT}epoc32/include/variant \
-    $${EPOCROOT}epoc32/include/stdapis \
-    $${EPOCROOT}epoc32/include/gcce \
-    $$INCLUDEPATH
-
diff --git a/mkspecs/symbian-gcce/qplatformdefs.h b/mkspecs/symbian-gcce/qplatformdefs.h
deleted file mode 100644 (file)
index 8e465cc..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 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$
-** 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 "../common/symbian/qplatformdefs.h"
-
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_clean.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_clean.flm
deleted file mode 100644 (file)
index c9a88fc..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-# /****************************************************************************
-# **
-# ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-# ** Contact: Nokia Corporation (qt-info@nokia.com)
-# **
-# ** This file is part of symbian-sbsv2 mkspec.
-# **
-# ****************************************************************************/
-
-
-SINGLETON:=$(call sanitise,QMAKE_CLEAN_SINGLETON_$(EXTENSION_ROOT))
-
-ifeq ($($(SINGLETON)),)
-# Prevent duplicate targets from being created
-$(SINGLETON):=1
-$(eval $(call GenerateStandardCleanTarget,$(wildcard $(patsubst "%",%,$(CLEAN_FILES)))))
-endif
-
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
deleted file mode 100644 (file)
index 8791a47..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-# /****************************************************************************
-# **
-# ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-# ** Contact: Nokia Corporation (qt-info@nokia.com)
-# **
-# ** This file is part of symbian-sbsv2 mkspec.
-# **
-# ****************************************************************************/
-
-
-SINGLETON:=$(call sanitise,TARGET_$(DEPLOY_TARGET))
-CLEAN_TARGET:=
-
-# Deployment dependencies collection target for post link operations
-all_qmake_emulator_deployment_dependencies::
-
-define qmake_emulator_deployment
-$(ALLTARGET):: $(1)
-
-# Prevent duplicate targets from being created
-$(SINGLETON):=1
-
-CLEAN_TARGET:=$(1)
-
-$(1): $(2) all_qmake_emulator_deployment_dependencies
-       $(call startrule,qmake_emulator_deployment) \
-       $(GNUCP) --remove-destination --no-preserve=mode $(2) "$$@" && \
-       $(GNUCHMOD) a+rw "$$@" \
-       $(call endrule,qmake_emulator_deployment)       
-endef
-
-ifeq ($($(SINGLETON)),)
-$(eval $(call qmake_emulator_deployment, $(subst $(CHAR_SPACE),\$(CHAR_SPACE),$(DEPLOY_TARGET)), $(subst $(CHAR_SPACE),\$(CHAR_SPACE),$(DEPLOY_SOURCE))))
-$(call makepath,$(dir $(DEPLOY_TARGET)))
-$(eval $(call GenerateStandardCleanTarget,$(CLEAN_TARGET),''))
-$(eval $(call whatmacro,$(CLEAN_TARGET)))
-endif  
-
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm
deleted file mode 100644 (file)
index dce7f20..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-# /****************************************************************************
-# **
-# ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-# ** Contact: Nokia Corporation (qt-info@nokia.com)
-# **
-# ** This file is part of symbian-sbsv2 mkspec.
-# **
-# ****************************************************************************/
-
-
-SINGLETON:=$(call sanitise,TARGET_$(PREDEP_TARGET))
-
-$(call makepathfor,$(PREDEP_TARGET))
-
-ifeq ($(patsubst /epoc32/%,MATCH,$(firstword $(COMMAND))),MATCH)
-COMMAND:=$(EPOCROOT)$(COMMAND)
-endif
-
-define qmake_extra_pre_targetdep
-EXPORT:: $(PREDEP_TARGET)
-
-# Prevent duplicate targets from being created
-$(SINGLETON):=1
-
-$(PREDEP_TARGET): $(DEPS)
-       $(call startrule,qmake_extra_pre_targetdep,FORCESUCCESS) \
-       $(COMMAND) \
-       $(call endrule,qmake_extra_pre_targetdep)
-endef
-
-ifeq ($($(SINGLETON)),)
-$(eval $(qmake_extra_pre_targetdep))
-$(eval $(call GenerateStandardCleanTarget,$(PREDEP_TARGET),''))
-endif  
-
-
-
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm
deleted file mode 100644 (file)
index 0312d14..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-# /****************************************************************************
-# **
-# ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-# ** Contact: Nokia Corporation (qt-info@nokia.com)
-# **
-# ** This file is part of symbian-sbsv2 mkspec.
-# **
-# ****************************************************************************/
-
-
-POST_LINK_TARGET:=POST_LINK_$(PLATFORM_PATH)_$(CFG_PATH)_$(call sanitise,$(LINK_TARGET))
-POST_LINK_DEP:=$(EPOCROOT)/epoc32/release/$(PLATFORM_PATH)/$(CFG_PATH)/$(LINK_TARGET)
-
-# Passing $(PLATFORM_PATH) etc. variables in FLM options makes sbsv2 toolchain to double the dollar signs, 
-# requiring evaluating them twice in order to get desired values, 
-# so do an extra evaluation before using the command.
-define command_fixer
-       THE_COMMAND:=$(POST_LINK_CMD)
-endef
-
-all_qmake_emulator_deployment_dependencies:: $(POST_LINK_TARGET)
-
-define qmake_post_link
-$(ALLTARGET):: $(POST_LINK_TARGET)
-
-$(POST_LINK_TARGET): $(POST_LINK_DEP)
-       $(call startrule,qmake_post_link) \
-       $(THE_COMMAND) \
-       $(call endrule,qmake_post_link)
-endef
-
-$(eval $(command_fixer))
-$(eval $(qmake_post_link))
-
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
deleted file mode 100644 (file)
index 4bbc756..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-# /****************************************************************************
-# **
-# ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-# ** Contact: Nokia Corporation (qt-info@nokia.com)
-# **
-# ** This file is part of symbian-sbsv2 mkspec.
-# **
-# ****************************************************************************/
-
-
-SINGLETON:=$(call sanitise,TSTORE_SINGLETON_$(EXTENSION_ROOT))
-
-ifeq ($($(SINGLETON)),)
-# Prevent duplicate targets from being created, as that can lead to build breaks
-# in multiprocessor systems if two or more targets try to write to .make.cache at
-# the same time.
-$(SINGLETON):=1
-
-STORE_BUILD_TARGET:=$(call sanitise,TSTORE_BUILD_$(PLATFORM_PATH)_$(CFG_PATH)_$(EXTENSION_ROOT))
-CACHE_FILENAME:=$(EXTENSION_ROOT)/.make.cache
-
-ifeq "$(CFG_PATH)" "udeb"
-VISUAL_CFG:=DEBUG
-else
-VISUAL_CFG:=RELEASE
-endif
-
-define qmake_store_build
-$(ALLTARGET):: $(STORE_BUILD_TARGET)
-
-$(STORE_BUILD_TARGET):
-       $(call startrule,qmake_store_build) \
-       echo "# ==============================================================================" > $(CACHE_FILENAME) && \
-       echo "# This file is generated by make and should not be modified by the user" >> $(CACHE_FILENAME) && \
-       echo "#  Name        : .make.cache" >> $(CACHE_FILENAME) && \
-       echo "#  Part of     : " >> $(CACHE_FILENAME) && \
-       echo "#  Description : This file is used to cache last build target for" >> $(CACHE_FILENAME) && \
-       echo "#                make sis target." >> $(CACHE_FILENAME) && \
-       echo "#  Version     : " >> $(CACHE_FILENAME) && \
-       echo "# ==============================================================================" >> $(CACHE_FILENAME) && \
-       echo QT_SIS_TARGET ?= $(VISUAL_CFG)-$(PLATFORM_PATH) >> $(CACHE_FILENAME)
-       $(call endrule,qmake_store_build)
-endef
-
-$(eval $(qmake_store_build))
-$(eval $(call GenerateStandardCleanTarget,$(CACHE_FILENAME),''))
-endif
-
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qt.xml b/mkspecs/symbian-sbsv2/flm/qt/qt.xml
deleted file mode 100644 (file)
index f2f32ee..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-# /****************************************************************************
-# **
-# ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-# ** Contact: Nokia Corporation (qt-info@nokia.com)
-# **
-# ** This file is part of symbian-sbsv2 mkspec.
-# **
-# ****************************************************************************/
--->
-
-<build xmlns="http://symbian.com/xml/build"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://symbian.com/xml/build http://symbian.com/xml/build/2_0.xsd">
-
-       <!-- Extension interfaces : replacements for Template Extension Makefiles -->
-    
-    <interface name="qt.qmake_extra_pre_targetdep.export" extends="Symbian.UserFLM"
-                flm="qmake_extra_pre_targetdep.flm">
-        <param name='PREDEP_TARGET' />
-        <param name='DEPS' default = '' />
-        <param name='COMMAND' default = '' />
-       </interface>
-    
-    <interface name="qt.qmake_emulator_deployment" extends="Symbian.UserFLM"
-                flm="qmake_emulator_deployment.flm">
-        <param name='DEPLOY_SOURCE' />
-        <param name='DEPLOY_TARGET' />
-    </interface>
-
-    <interface name="qt.qmake_post_link" extends="Symbian.UserFLM"
-                flm="qmake_post_link.flm">
-        <param name='POST_LINK_CMD' />
-        <param name='LINK_TARGET' />
-    </interface>
-
-    <interface name="qt.qmake_store_build" extends="Symbian.UserFLM"
-                flm="qmake_store_build.flm">
-    </interface>    
-
-    <interface name="qt.qmake_clean" extends="Symbian.UserFLM"
-                flm="qmake_clean.flm">
-        <param name='CLEAN_FILES' />
-    </interface>
-</build>
diff --git a/mkspecs/symbian-sbsv2/qmake.conf b/mkspecs/symbian-sbsv2/qmake.conf
deleted file mode 100644 (file)
index 73d3ee3..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# qmake configuration for symbian-sbsv2
-#
-# Written for SYMBIAN_SBSV2
-#
-
-MAKEFILE_GENERATOR  = SYMBIAN_SBSV2
-option(recursive)
-
-include(../common/symbian/symbian-mmp.conf)
diff --git a/mkspecs/symbian-sbsv2/qplatformdefs.h b/mkspecs/symbian-sbsv2/qplatformdefs.h
deleted file mode 100644 (file)
index ffca5c9..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 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$
-** 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 "../common/symbian/qplatformdefs.h"
-