diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp index c3088271b68dc00323f2167d42575792ff65c7a8..ae49efe0b7b37b86f42ec629dbff8f00c35fefa3 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp @@ -42,7 +42,6 @@ MaemoToolChain::MaemoToolChain(const QString &targetRoot) , m_maddeInitialized(false) , m_sysrootInitialized(false) , m_simulatorInitialized(false) - , m_toolchainInitialized(false) , m_targetRoot(targetRoot) { } @@ -62,8 +61,6 @@ void MaemoToolChain::addToEnvironment(ProjectExplorer::Environment &env) .arg(maddeRoot()))); env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin") .arg(targetRoot()))); - env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/bin") - .arg(toolchainRoot()))); #ifdef Q_OS_WIN env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/madbin") .arg(maddeRoot()))); @@ -78,11 +75,10 @@ QString MaemoToolChain::makeCommand() const bool MaemoToolChain::equals(ToolChain *other) const { MaemoToolChain *toolChain = static_cast<MaemoToolChain*> (other); - return (other->type() == type() + return other->type() == type() && toolChain->sysrootRoot() == sysrootRoot() && toolChain->simulatorRoot() == simulatorRoot() - && toolChain->targetRoot() == targetRoot() - && toolChain->toolchainRoot() == toolchainRoot()); + && toolChain->targetRoot() == targetRoot(); } QString MaemoToolChain::maddeRoot() const @@ -100,7 +96,7 @@ QString MaemoToolChain::targetRoot() const QString MaemoToolChain::sysrootRoot() const { if (!m_sysrootInitialized) - setSysrootAndToolchain(); + setSysroot(); return m_sysrootRoot; } @@ -111,13 +107,6 @@ QString MaemoToolChain::simulatorRoot() const return m_simulatorRoot; } -QString MaemoToolChain::toolchainRoot() const -{ - if (!m_toolchainInitialized) - setSysrootAndToolchain(); - return m_toolchainRoot; -} - void MaemoToolChain::setMaddeRoot() const { QDir dir(targetRoot()); @@ -162,7 +151,7 @@ void MaemoToolChain::setSimulatorRoot() const m_simulatorInitialized = true; } -void MaemoToolChain::setSysrootAndToolchain() const +void MaemoToolChain::setSysroot() const { QFile file(QDir::cleanPath(targetRoot()) + QLatin1String("/information")); if (file.exists() && file.open(QIODevice::ReadOnly | QIODevice::Text)) { @@ -176,13 +165,8 @@ void MaemoToolChain::setSysrootAndToolchain() const m_sysrootRoot = maddeRoot() + QLatin1String("/sysroots/") + list.at(1); } - if (list.at(0) == QLatin1String("toolchain")) { - m_toolchainRoot = maddeRoot() + QLatin1String("/toolchains/") - + list.at(1); - } } } m_sysrootInitialized = true; - m_toolchainInitialized = true; } diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h index 0d285abf2c0133a41f971e7fc4f349e167b3c9c9..a3d6c3f1280dfc6efb0f7b3bacdce6632354b10d 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h +++ b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h @@ -56,7 +56,6 @@ public: QString targetRoot() const; QString sysrootRoot() const; QString simulatorRoot() const; - QString toolchainRoot() const; protected: bool equals(ToolChain *other) const; @@ -64,7 +63,7 @@ protected: private: void setMaddeRoot() const; void setSimulatorRoot() const; - void setSysrootAndToolchain() const; + void setSysroot() const; private: mutable QString m_maddeRoot; @@ -76,9 +75,6 @@ private: mutable QString m_simulatorRoot; mutable bool m_simulatorInitialized; - mutable QString m_toolchainRoot; - mutable bool m_toolchainInitialized; - const QString m_targetRoot; };