diff options
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/qbsprojectmanager/qbsprojectparser.cpp | 9 | ||||
-rw-r--r-- | src/plugins/qbsprojectmanager/qbsprojectparser.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/plugins/qbsprojectmanager/qbsprojectparser.cpp b/src/plugins/qbsprojectmanager/qbsprojectparser.cpp index 33de434ef9..484bae73ca 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectparser.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectparser.cpp @@ -100,6 +100,7 @@ void QbsProjectParser::parse(const QVariantMap &config, const Environment &env, const qbs::Preferences prefs(QbsManager::settings(), profileName); params.setSearchPaths(prefs.searchPaths(resourcesBaseDirectory())); params.setPluginPaths(prefs.pluginPaths(pluginsBaseDirectory())); + params.setLibexecPath(libExecDirectory()); m_qbsSetupProjectJob = m_project.setupProject(params, QbsManager::logSink(), 0); @@ -163,6 +164,14 @@ QString QbsProjectParser::resourcesBaseDirectory() const return Core::ICore::resourcePath() + QLatin1String("/qbs"); } +QString QbsProjectParser::libExecDirectory() const +{ + const QString qbsInstallDir = QLatin1String(QBS_INSTALL_DIR); + if (!qbsInstallDir.isEmpty()) + return qbsInstallDir + QLatin1String("/libexec"); + return Core::ICore::libexecPath(); +} + QString QbsProjectParser::pluginsBaseDirectory() const { const QString qbsInstallDir = QLatin1String(QBS_INSTALL_DIR); diff --git a/src/plugins/qbsprojectmanager/qbsprojectparser.h b/src/plugins/qbsprojectmanager/qbsprojectparser.h index 6d6319394a..8603205213 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectparser.h +++ b/src/plugins/qbsprojectmanager/qbsprojectparser.h @@ -69,6 +69,7 @@ private slots: private: QString pluginsBaseDirectory() const; QString resourcesBaseDirectory() const; + QString libExecDirectory() const; QString m_projectFilePath; qbs::SetupProjectJob *m_qbsSetupProjectJob; |