diff --git a/src/plugins/projectexplorer/abstractmsvctoolchain.cpp b/src/plugins/projectexplorer/abstractmsvctoolchain.cpp index 264af9cb037a50556edd2121b2fe680e26597f41..5a094a1b7453596666a4505e853e693c86150314 100644 --- a/src/plugins/projectexplorer/abstractmsvctoolchain.cpp +++ b/src/plugins/projectexplorer/abstractmsvctoolchain.cpp @@ -258,6 +258,23 @@ bool AbstractMsvcToolChain::generateEnvironmentSettings(Utils::Environment &env, return true; } +QString AbstractMsvcToolChain::findInstalledJom() +{ + if (Abi::hostAbi().os() != Abi::WindowsOS) { + qWarning() << "Jom can only be used on Windows"; + return QString(); + } + + // We want jom! Try to find it. + const QString jom = QLatin1String("jom.exe"); + const QFileInfo installedJom = QFileInfo(QCoreApplication::applicationDirPath() + + QLatin1Char('/') + jom); + if (installedJom.isFile() && installedJom.isExecutable()) + return installedJom.absoluteFilePath(); + else + return jom; +} + } // namespace Internal } // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/abstractmsvctoolchain.h b/src/plugins/projectexplorer/abstractmsvctoolchain.h index 1c346a13a6dab37808ea8b3d6a4e94b125457d0b..26908a8b83a666ec18a25d7b3555dca1c03c8d72 100644 --- a/src/plugins/projectexplorer/abstractmsvctoolchain.h +++ b/src/plugins/projectexplorer/abstractmsvctoolchain.h @@ -64,6 +64,7 @@ public: bool canClone() const; QString varsBat() const { return m_vcvarsBat; } + static QString findInstalledJom(); protected: virtual Utils::Environment readEnvironmentSetting(Utils::Environment& env) const = 0; virtual QByteArray msvcPredefinedMacros(const Utils::Environment& env) const; diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index e54a093e28a135865f35dead13313c20456a8a64..2439ec0b492095190100c7726e6e99d8e24480a5 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -874,23 +874,6 @@ QString MingwToolChain::makeCommand() const return QLatin1String("mingw32-make.exe"); } -QString MingwToolChain::findInstalledJom() -{ - if (Abi::hostAbi().os() != Abi::WindowsOS) { - qWarning() << "Jom can only be used on Windows"; - return QString(); - } - - // We want jom! Try to find it. - const QString jom = QLatin1String("jom.exe"); - const QFileInfo installedJom = QFileInfo(QCoreApplication::applicationDirPath() - + QLatin1Char('/') + jom); - if (installedJom.isFile() && installedJom.isExecutable()) - return installedJom.absoluteFilePath(); - else - return jom; -} - ToolChain *MingwToolChain::clone() const { return new MingwToolChain(*this); diff --git a/src/plugins/projectexplorer/gcctoolchain.h b/src/plugins/projectexplorer/gcctoolchain.h index 8aee14a93adf883b8c6e49fda7fc6c130e8bae16..8ab8111e5c2901795c97db6e1e62c844699b2e3f 100644 --- a/src/plugins/projectexplorer/gcctoolchain.h +++ b/src/plugins/projectexplorer/gcctoolchain.h @@ -145,7 +145,6 @@ public: QString typeName() const; Utils::FileName mkspec() const; QString makeCommand() const; - static QString findInstalledJom(); ToolChain *clone() const;