feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix location of qbs plugins.

Browse Source 
They are not (arch-independent) resources.

Task-number: QTCREATORBUG-10074
Change-Id: If257dfc3a8a866003c84331409162699b162eb19
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Christian Kandeler
2014-02-25 16:39:09 +01:00
parent c4ef72dd39
commit 8a8092912b
5 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qtcreator.pro
View File

@@ -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_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_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_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") system("echo CONFIG += qbs_no_dev_install >> $$qmake_cache")
} }

18
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -63,6 +63,8 @@
#include <qbs.h> #include <qbs.h>
#include <QCoreApplication>
#include <QDir>
#include <QFileInfo> #include <QFileInfo>
using namespace Core; using namespace Core;
@@ -462,9 +464,8 @@ void QbsProject::parse(const QVariantMap &config, const Environment &env, const
params.setIgnoreDifferentProjectFilePath(false); params.setIgnoreDifferentProjectFilePath(false);
params.setEnvironment(env.toProcessEnvironment()); params.setEnvironment(env.toProcessEnvironment());
const qbs::Preferences prefs(QbsManager::settings(), profileName); const qbs::Preferences prefs(QbsManager::settings(), profileName);
const QString qbsDir = qbsDirectory(); params.setSearchPaths(prefs.searchPaths(resourcesBaseDirectory()));
params.setSearchPaths(prefs.searchPaths(qbsDir)); params.setPluginPaths(prefs.pluginPaths(pluginsBaseDirectory()));
params.setPluginPaths(prefs.pluginPaths(qbsDir));
// Do the parsing: // Do the parsing:
prepareForParsing(); prepareForParsing();
@@ -705,7 +706,7 @@ void QbsProject::updateDeploymentInfo(const qbs::Project &project)
activeTarget()->setDeploymentData(deploymentData); activeTarget()->setDeploymentData(deploymentData);
} }
QString QbsProject::qbsDirectory() const QString QbsProject::resourcesBaseDirectory() const
{ {
const QString qbsInstallDir = QLatin1String(QBS_INSTALL_DIR); const QString qbsInstallDir = QLatin1String(QBS_INSTALL_DIR);
if (!qbsInstallDir.isEmpty()) if (!qbsInstallDir.isEmpty())
@@ -713,5 +714,14 @@ QString QbsProject::qbsDirectory() const
return ICore::resourcePath() + QLatin1String("/qbs"); 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 Internal
} // namespace QbsProjectManager } // namespace QbsProjectManager

3
src/plugins/qbsprojectmanager/qbsproject.h
View File

@@ -131,7 +131,8 @@ private:
void updateQmlJsCodeModel(const qbs::ProjectData &prj); void updateQmlJsCodeModel(const qbs::ProjectData &prj);
void updateApplicationTargets(const qbs::ProjectData &projectData); void updateApplicationTargets(const qbs::ProjectData &projectData);
void updateDeploymentInfo(const qbs::Project &project); void updateDeploymentInfo(const qbs::Project &project);
QString qbsDirectory() const; QString resourcesBaseDirectory() const;
QString pluginsBaseDirectory() const;
QbsManager *const m_manager; QbsManager *const m_manager;
const QString m_projectName; const QString m_projectName;

2
src/shared/qbs

Submodule src/shared/qbs updated: de8682b7d4...0816b8e476

1
src/src.qbs
View File

@@ -27,6 +27,7 @@ Project {
property path libRPaths: qbs.targetOS.contains("osx") property path libRPaths: qbs.targetOS.contains("osx")
? ["@loader_path/.."] : ["$ORIGIN/.."] ? ["@loader_path/.."] : ["$ORIGIN/.."]
property path resourcesInstallDir: project.ide_data_path + "/qbs" property path resourcesInstallDir: project.ide_data_path + "/qbs"
property string pluginsInstallDir: "lib/qtcreator"
references: [ references: [
qbsBaseDir + "/src/lib/libs.qbs", qbsBaseDir + "/src/lib/libs.qbs",