diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h index 3578e8fe002..0ab9492792f 100644 --- a/src/plugins/projectexplorer/toolchain.h +++ b/src/plugins/projectexplorer/toolchain.h @@ -84,6 +84,7 @@ public: virtual ToolChainType type() const = 0; virtual QString makeCommand() const = 0; virtual IOutputParser *outputParser() const = 0; + virtual QString sysroot() const { return QString(); } ToolChain(); virtual ~ToolChain(); diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp index ba13086a272..2069f2eeae7 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp @@ -597,10 +597,10 @@ void MaemoDeployStep::installToSysroot() } else { writeOutput(tr("Copying files to sysroot ...")); Q_ASSERT(!m_filesToCopy.isEmpty()); - QDir sysRootDir(toolChain()->sysrootRoot()); + QDir sysRootDir(toolChain()->sysroot()); foreach (const MaemoDeployable &d, m_filesToCopy) { const QLatin1Char sep('/'); - const QString targetFilePath = toolChain()->sysrootRoot() + sep + const QString targetFilePath = toolChain()->sysroot() + sep + d.remoteDir + sep + QFileInfo(d.localFilePath).fileName(); sysRootDir.mkpath(d.remoteDir.mid(1)); QFile::remove(targetFilePath); diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp index 48963be2501..9c3c58ef14e 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp @@ -242,7 +242,7 @@ MaemoDeployStep *MaemoRunConfiguration::deployStep() const const QString MaemoRunConfiguration::sysRoot() const { if (const MaemoToolChain *tc = toolchain()) - return tc->sysrootRoot(); + return tc->sysroot(); return QString(); } diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp index 8950db21078..69896d280f5 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.cpp @@ -70,7 +70,7 @@ void MaemoToolChain::addToEnvironment(Utils::Environment &env) .arg(MaemoGlobal::targetRoot(m_qtVersion)))); // put this into environment to make pkg-config stuff work - env.prependOrSet(QLatin1String("SYSROOT_DIR"), sysrootRoot()); + env.prependOrSet(QLatin1String("SYSROOT_DIR"), sysroot()); env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/madbin") .arg(maddeRoot))); env.prependOrSetPath(QDir::toNativeSeparators(QString("%1/madlib") @@ -90,7 +90,7 @@ bool MaemoToolChain::equals(const ToolChain *other) const return other->type() == type() && toolChain->m_qtVersion == m_qtVersion; } -QString MaemoToolChain::sysrootRoot() const +QString MaemoToolChain::sysroot() const { if (!m_sysrootInitialized) setSysroot(); diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h index e8e149a6af2..de8c6fc50c3 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h +++ b/src/plugins/qt4projectmanager/qt-maemo/maemotoolchain.h @@ -49,8 +49,7 @@ public: void addToEnvironment(Utils::Environment &env); ProjectExplorer::ToolChainType type() const; QString makeCommand() const; - - QString sysrootRoot() const; + QString sysroot() const; protected: bool equals(const ToolChain *other) const;