feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "Custom targets can set QtVersion to support id and set abis"

Browse Source 
This reverts commit 462278b071 for master.
This commit is contained in:
Oswald Buddenhagen
2011-06-22 12:18:19 +02:00
parent 24131890e6
commit 8766b88de6
2 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qt4projectmanager/qtversionmanager.cpp
View File

@@ -1413,39 +1413,21 @@ QString QtVersion::systemRoot() const
bool QtVersion::supportsTargetId(const QString &id) const bool QtVersion::supportsTargetId(const QString &id) const
{ {
updateAbiAndMkspec(); updateAbiAndMkspec();
if (!m_forcedTargetIds.isEmpty())
return m_forcedTargetIds.contains(id);
return m_targetIds.contains(id); return m_targetIds.contains(id);
} }
QSet<QString> QtVersion::supportedTargetIds() const QSet<QString> QtVersion::supportedTargetIds() const
{ {
updateAbiAndMkspec(); updateAbiAndMkspec();
if (!m_forcedTargetIds.isEmpty())
return m_forcedTargetIds;
return m_targetIds; return m_targetIds;
} }
QList<ProjectExplorer::Abi> QtVersion::qtAbis() const QList<ProjectExplorer::Abi> QtVersion::qtAbis() const
{ {
updateAbiAndMkspec(); updateAbiAndMkspec();
if (!m_forcedAbis.isEmpty())
return m_forcedAbis;
return m_abis; return m_abis;
} }
void QtVersion::setForcedTargetIds(const QSet<QString> &ids)
{
updateAbiAndMkspec();
m_forcedTargetIds = ids;
}
void QtVersion::setForcedQtAbis(const QList<ProjectExplorer::Abi> &abis)
{
updateAbiAndMkspec();
m_forcedAbis = abis;
}
// if none, then it's INVALID everywhere this function is called // if none, then it's INVALID everywhere this function is called
void QtVersion::updateAbiAndMkspec() const void QtVersion::updateAbiAndMkspec() const
{ {

5
src/plugins/qt4projectmanager/qtversionmanager.h
View File

@@ -118,9 +118,6 @@ public:
QList<ProjectExplorer::Abi> qtAbis() const; QList<ProjectExplorer::Abi> qtAbis() const;
void setForcedTargetIds(const QSet<QString> &ids);
void setForcedQtAbis(const QList<ProjectExplorer::Abi> &abis);
/// @returns the name of the mkspec, which is generally not enough /// @returns the name of the mkspec, which is generally not enough
/// to pass to qmake. /// to pass to qmake.
QString mkspec() const; QString mkspec() const;
@@ -224,7 +221,6 @@ private:
mutable QString m_mkspec; // updated lazily mutable QString m_mkspec; // updated lazily
mutable QString m_mkspecFullPath; mutable QString m_mkspecFullPath;
mutable QList<ProjectExplorer::Abi> m_abis; mutable QList<ProjectExplorer::Abi> m_abis;
mutable QList<ProjectExplorer::Abi> m_forcedAbis;
mutable bool m_versionInfoUpToDate; mutable bool m_versionInfoUpToDate;
mutable QHash<QString,QString> m_versionInfo; // updated lazily mutable QHash<QString,QString> m_versionInfo; // updated lazily
@@ -242,7 +238,6 @@ private:
mutable QString m_linguistCommand; mutable QString m_linguistCommand;
mutable QString m_qmlviewerCommand; mutable QString m_qmlviewerCommand;
mutable QSet<QString> m_targetIds; mutable QSet<QString> m_targetIds;
mutable QSet<QString> m_forcedTargetIds;
mutable bool m_isBuildUsingSbsV2; mutable bool m_isBuildUsingSbsV2;
mutable bool m_qmakeIsExecutable; mutable bool m_qmakeIsExecutable;