From b797ccaa3e796a806ffed19a32016978d88b385e Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Wed, 11 Aug 2010 14:44:46 +0200
Subject: [PATCH] Add function to find out whether sbsv2 is used
* Add function to check whether the new symbian build system is used
to build a Qt version. This will be used to decide which parsers
to use when building for symbian
---
src/plugins/qt4projectmanager/qtversionmanager.cpp | 9 +++++++++
src/plugins/qt4projectmanager/qtversionmanager.h | 4 ++++
2 files changed, 13 insertions(+)
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index f0e2d8fe9c9..aebca2b637a 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -693,6 +693,12 @@ QString QtVersion::mkspecPath() const
return m_mkspecFullPath;
}
+bool QtVersion::isBuildWithSymbianSbsV2() const
+{
+ updateToolChainAndMkspec();
+ return m_isBuildUsingSbsV2;
+}
+
QString QtVersion::qtVersionString() const
{
if (m_qtVersionString.isNull()) {
@@ -1325,6 +1331,8 @@ void QtVersion::updateToolChainAndMkspec() const
m_mkspec = mkspec;
+ m_isBuildUsingSbsV2 = false;
+
// qDebug()<<"mkspec for "<<qmakeCommand()<<" is "<<m_mkspec<<m_mkspecFullPath;
ProFileOption option;
@@ -1351,6 +1359,7 @@ void QtVersion::updateToolChainAndMkspec() const
} else if (makefileGenerator == QLatin1String("SYMBIAN_ABLD") ||
makefileGenerator == QLatin1String("SYMBIAN_SBSV2") ||
makefileGenerator == QLatin1String("SYMBIAN_UNIX")) {
+ m_isBuildUsingSbsV2 = (makefileGenerator == QLatin1String("SYMBIAN_SBSV2"));
if (S60Manager *s60mgr = S60Manager::instance()) {
# ifdef Q_OS_WIN
m_targetIds.insert(QLatin1String(Constants::S60_DEVICE_TARGET_ID));
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h
index 60f77252f3a..72517bdf3d4 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.h
+++ b/src/plugins/qt4projectmanager/qtversionmanager.h
@@ -84,6 +84,8 @@ public:
/// specifally not the directory the symlink/ORIGINAL_QMAKESPEC points to
QString mkspecPath() const;
+ bool isBuildWithSymbianSbsV2() const;
+
void setDisplayName(const QString &name);
void setQMakeCommand(const QString &path);
@@ -189,6 +191,8 @@ private:
mutable QString m_designerCommand;
mutable QString m_linguistCommand;
mutable QSet<QString> m_targetIds;
+
+ mutable bool m_isBuildUsingSbsV2;
};
struct QMakeAssignment
--
GitLab