Commit 8a809291 authored by Christian Kandeler's avatar Christian Kandeler

Fix location of qbs plugins.

They are not (arch-independent) resources.

Task-number: QTCREATORBUG-10074
Change-Id: If257dfc3a8a866003c84331409162699b162eb19
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent c4ef72dd
......@@ -43,6 +43,8 @@ exists(src/shared/qbs/qbs.pro) {
system("echo QBS_LIB_INSTALL_DIR = $${QTC_PREFIX}/$${IDE_LIBRARY_BASENAME}/qtcreator >> $$qmake_cache")
system("echo QBS_RESOURCES_BUILD_DIR = $${maybe_backslash}\"$${IDE_DATA_PATH}/qbs$${maybe_backslash}\" >> $$qmake_cache")
system("echo QBS_RESOURCES_INSTALL_DIR = $${QTC_PREFIX}/share/qtcreator/qbs >> $$qmake_cache")
system("echo QBS_PLUGINS_BUILD_DIR = $${maybe_backslash}\"$${IDE_BUILD_TREE}/lib/qtcreator/$${maybe_backslash}\" >> $$qmake_cache")
system("echo QBS_PLUGINS_INSTALL_DIR = $${QTC_PREFIX}/lib/qtcreator >> $$qmake_cache")
system("echo CONFIG += qbs_no_dev_install >> $$qmake_cache")
}
......
......@@ -63,6 +63,8 @@
#include <qbs.h>
#include <QCoreApplication>
#include <QDir>
#include <QFileInfo>
using namespace Core;
......@@ -462,9 +464,8 @@ void QbsProject::parse(const QVariantMap &config, const Environment &env, const
params.setIgnoreDifferentProjectFilePath(false);
params.setEnvironment(env.toProcessEnvironment());
const qbs::Preferences prefs(QbsManager::settings(), profileName);
const QString qbsDir = qbsDirectory();
params.setSearchPaths(prefs.searchPaths(qbsDir));
params.setPluginPaths(prefs.pluginPaths(qbsDir));
params.setSearchPaths(prefs.searchPaths(resourcesBaseDirectory()));
params.setPluginPaths(prefs.pluginPaths(pluginsBaseDirectory()));
// Do the parsing:
prepareForParsing();
......@@ -705,7 +706,7 @@ void QbsProject::updateDeploymentInfo(const qbs::Project &project)
activeTarget()->setDeploymentData(deploymentData);
}
QString QbsProject::qbsDirectory() const
QString QbsProject::resourcesBaseDirectory() const
{
const QString qbsInstallDir = QLatin1String(QBS_INSTALL_DIR);
if (!qbsInstallDir.isEmpty())
......@@ -713,5 +714,14 @@ QString QbsProject::qbsDirectory() const
return ICore::resourcePath() + QLatin1String("/qbs");
}
QString QbsProject::pluginsBaseDirectory() const
{
const QString qbsInstallDir = QLatin1String(QBS_INSTALL_DIR);
if (!qbsInstallDir.isEmpty())
return qbsInstallDir + QLatin1String("/lib/");
return QDir::cleanPath(QCoreApplication::applicationDirPath()
+ QLatin1String("/../lib/qtcreator"));
}
} // namespace Internal
} // namespace QbsProjectManager
......@@ -131,7 +131,8 @@ private:
void updateQmlJsCodeModel(const qbs::ProjectData &prj);
void updateApplicationTargets(const qbs::ProjectData &projectData);
void updateDeploymentInfo(const qbs::Project &project);
QString qbsDirectory() const;
QString resourcesBaseDirectory() const;
QString pluginsBaseDirectory() const;
QbsManager *const m_manager;
const QString m_projectName;
......
Subproject commit de8682b7d4fccdef5c93759336e51ab73ecd5021
Subproject commit 0816b8e476d20e00cbcffd1e71162adf93e85658
......@@ -27,6 +27,7 @@ Project {
property path libRPaths: qbs.targetOS.contains("osx")
? ["@loader_path/.."] : ["$ORIGIN/.."]
property path resourcesInstallDir: project.ide_data_path + "/qbs"
property string pluginsInstallDir: "lib/qtcreator"
references: [
qbsBaseDir + "/src/lib/libs.qbs",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment