No need to cache the Qt version for this simple task.

Might fix some sporadic crashes that can be seen on first creator run.
This commit is contained in:
kh1
2009-11-30 12:04:02 +01:00
parent 615105cccd
commit fed63463d3
2 changed files with 10 additions and 25 deletions

View File

@@ -51,10 +51,10 @@ MaemoToolChain::MaemoToolChain(const Qt4ProjectManager::QtVersion *version)
, m_maddeInitialized(false) , m_maddeInitialized(false)
, m_sysrootInitialized(false) , m_sysrootInitialized(false)
, m_simulatorInitialized(false) , m_simulatorInitialized(false)
, m_targetInitialized(false)
, m_toolchainInitialized(false) , m_toolchainInitialized(false)
, m_version(version)
{ {
QString qmake = QDir::cleanPath(version->qmakeCommand());
m_targetRoot = qmake.remove(QLatin1String("/bin/qmake" EXEC_SUFFIX));
} }
MaemoToolChain::~MaemoToolChain() MaemoToolChain::~MaemoToolChain()
@@ -79,7 +79,6 @@ QList<HeaderPath> MaemoToolChain::systemHeaderPaths()
void MaemoToolChain::addToEnvironment(ProjectExplorer::Environment &env) void MaemoToolChain::addToEnvironment(ProjectExplorer::Environment &env)
{ {
if (m_version) {
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin") env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin")
.arg(maddeRoot()))); .arg(maddeRoot())));
env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin") env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin")
@@ -90,7 +89,6 @@ void MaemoToolChain::addToEnvironment(ProjectExplorer::Environment &env)
env.set("HOME", QDir::toNativeSeparators(maddeRoot() env.set("HOME", QDir::toNativeSeparators(maddeRoot()
+ QLatin1String("/home/") + QDir::home().dirName())); + QLatin1String("/home/") + QDir::home().dirName()));
#endif #endif
}
} }
QString MaemoToolChain::makeCommand() const QString MaemoToolChain::makeCommand() const
@@ -117,8 +115,6 @@ QString MaemoToolChain::maddeRoot() const
QString MaemoToolChain::targetRoot() const QString MaemoToolChain::targetRoot() const
{ {
if (!m_targetInitialized)
(const_cast<MaemoToolChain*> (this))->setTargetRoot();
return m_targetRoot; return m_targetRoot;
} }
@@ -143,13 +139,6 @@ QString MaemoToolChain::toolchainRoot() const
return m_toolchainRoot; return m_toolchainRoot;
} }
void MaemoToolChain::setTargetRoot()
{
m_targetInitialized = true;
QString qmake = QDir::cleanPath(m_version->qmakeCommand());
m_targetRoot = qmake.remove(QLatin1String("/bin/qmake" EXEC_SUFFIX));
}
void MaemoToolChain::setMaddeRoot() void MaemoToolChain::setMaddeRoot()
{ {
QDir dir(targetRoot()); QDir dir(targetRoot());

View File

@@ -58,7 +58,6 @@ protected:
private: private:
void setMaddeRoot(); void setMaddeRoot();
void setTargetRoot();
void setSimulatorRoot(); void setSimulatorRoot();
void setSysrootAndToolchain(); void setSysrootAndToolchain();
@@ -73,12 +72,9 @@ private:
bool m_simulatorInitialized; bool m_simulatorInitialized;
QString m_targetRoot; QString m_targetRoot;
bool m_targetInitialized;
QString m_toolchainRoot; QString m_toolchainRoot;
bool m_toolchainInitialized; bool m_toolchainInitialized;
const Qt4ProjectManager::QtVersion *m_version;
}; };
} // namespace Internal } // namespace Internal