From 1a5c8a1df761f260c0080a42c97696cb30d5ff22 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <qt-info@nokia.com>
Date: Thu, 19 Nov 2009 16:37:13 +0100
Subject: [PATCH] Support symbian-sbsv2 mkspecs
* Handle SBSv2 by doing the same as for the older ABLD
build system.
Reviewed-By: con
---
src/plugins/qt4projectmanager/qtversionmanager.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index c3fa345b6d2..c2d0ccbf125 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -1159,9 +1159,10 @@ void QtVersion::updateToolChainAndMkspec() const
if (!ce_sdk.isEmpty() && !ce_arch.isEmpty()) {
QString wincePlatformName = ce_sdk + " (" + ce_arch + QLatin1Char(')');
m_toolChains << ToolChainPtr(ProjectExplorer::ToolChain::createWinCEToolChain(msvcVersion(), wincePlatformName));
- } else if (makefileGenerator == "SYMBIAN_ABLD") {
+ } else if (makefileGenerator == QLatin1String("SYMBIAN_ABLD") ||
+ makefileGenerator == QLatin1String("SYMBIAN_SBSV2")) {
#ifdef QTCREATOR_WITH_S60
- if (S60Manager *s60mgr = S60Manager::instance()) {
+ if (S60Manager *s60mgr = S60Manager::instance()) {
# ifdef Q_OS_WIN
m_toolChains << ToolChainPtr(s60mgr->createGCCEToolChain(this))
<< ToolChainPtr(s60mgr->createRVCTToolChain(this, ProjectExplorer::ToolChain::RVCT_ARMV5))
--
GitLab