Commit b797ccaa authored by Tobias Hunger's avatar Tobias Hunger

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
parent 0710769d
...@@ -693,6 +693,12 @@ QString QtVersion::mkspecPath() const ...@@ -693,6 +693,12 @@ QString QtVersion::mkspecPath() const
return m_mkspecFullPath; return m_mkspecFullPath;
} }
bool QtVersion::isBuildWithSymbianSbsV2() const
{
updateToolChainAndMkspec();
return m_isBuildUsingSbsV2;
}
QString QtVersion::qtVersionString() const QString QtVersion::qtVersionString() const
{ {
if (m_qtVersionString.isNull()) { if (m_qtVersionString.isNull()) {
...@@ -1325,6 +1331,8 @@ void QtVersion::updateToolChainAndMkspec() const ...@@ -1325,6 +1331,8 @@ void QtVersion::updateToolChainAndMkspec() const
m_mkspec = mkspec; m_mkspec = mkspec;
m_isBuildUsingSbsV2 = false;
// qDebug()<<"mkspec for "<<qmakeCommand()<<" is "<<m_mkspec<<m_mkspecFullPath; // qDebug()<<"mkspec for "<<qmakeCommand()<<" is "<<m_mkspec<<m_mkspecFullPath;
ProFileOption option; ProFileOption option;
...@@ -1351,6 +1359,7 @@ void QtVersion::updateToolChainAndMkspec() const ...@@ -1351,6 +1359,7 @@ void QtVersion::updateToolChainAndMkspec() const
} else if (makefileGenerator == QLatin1String("SYMBIAN_ABLD") || } else if (makefileGenerator == QLatin1String("SYMBIAN_ABLD") ||
makefileGenerator == QLatin1String("SYMBIAN_SBSV2") || makefileGenerator == QLatin1String("SYMBIAN_SBSV2") ||
makefileGenerator == QLatin1String("SYMBIAN_UNIX")) { makefileGenerator == QLatin1String("SYMBIAN_UNIX")) {
m_isBuildUsingSbsV2 = (makefileGenerator == QLatin1String("SYMBIAN_SBSV2"));
if (S60Manager *s60mgr = S60Manager::instance()) { if (S60Manager *s60mgr = S60Manager::instance()) {
# ifdef Q_OS_WIN # ifdef Q_OS_WIN
m_targetIds.insert(QLatin1String(Constants::S60_DEVICE_TARGET_ID)); m_targetIds.insert(QLatin1String(Constants::S60_DEVICE_TARGET_ID));
......
...@@ -84,6 +84,8 @@ public: ...@@ -84,6 +84,8 @@ public:
/// specifally not the directory the symlink/ORIGINAL_QMAKESPEC points to /// specifally not the directory the symlink/ORIGINAL_QMAKESPEC points to
QString mkspecPath() const; QString mkspecPath() const;
bool isBuildWithSymbianSbsV2() const;
void setDisplayName(const QString &name); void setDisplayName(const QString &name);
void setQMakeCommand(const QString &path); void setQMakeCommand(const QString &path);
...@@ -189,6 +191,8 @@ private: ...@@ -189,6 +191,8 @@ private:
mutable QString m_designerCommand; mutable QString m_designerCommand;
mutable QString m_linguistCommand; mutable QString m_linguistCommand;
mutable QSet<QString> m_targetIds; mutable QSet<QString> m_targetIds;
mutable bool m_isBuildUsingSbsV2;
}; };
struct QMakeAssignment struct QMakeAssignment
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment