diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-03-28 13:26:46 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-03-28 16:27:49 +0100 |
| commit | de99c7a6ed193ca7685bc352b1dfc07a89a29a32 (patch) | |
| tree | dbb834f6fa9d7e3be9f3864fb806462ad41341d4 | |
| parent | 3599648ed9e58fe501ffa5215d34ed7a1b256c95 (diff) | |
fix location of qbs plugins on OS X
Task-number: QTCREATORBUG-11866
Change-Id: I261fdabd100c6f6827d4195624d56343cd59fb81
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | qtcreator.pro | 6 | ||||
| -rw-r--r-- | src/plugins/qbsprojectmanager/qbsproject.cpp | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/qtcreator.pro b/qtcreator.pro index cc0c0db48b..8e3676ab14 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -43,7 +43,11 @@ 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}/$${IDE_LIBRARY_BASENAME}/qtcreator/$${maybe_backslash}\" >> $$qmake_cache") + macx { + system("echo QBS_PLUGINS_BUILD_DIR = $${maybe_backslash}\"$${IDE_LIBRARY_PATH}$${maybe_backslash}\" >> $$qmake_cache") + } else { + system("echo QBS_PLUGINS_BUILD_DIR = $${maybe_backslash}\"$${IDE_BUILD_TREE}/$${IDE_LIBRARY_BASENAME}/qtcreator/$${maybe_backslash}\" >> $$qmake_cache") + } system("echo QBS_PLUGINS_INSTALL_DIR = $${QTC_PREFIX}/$${IDE_LIBRARY_BASENAME}/qtcreator >> $$qmake_cache") system("echo QBS_LIBRARY_DIRNAME = $${IDE_LIBRARY_BASENAME} >> $$qmake_cache") system("echo CONFIG += qbs_no_dev_install >> $$qmake_cache") diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 59bf6d1dd7..bbff9bf668 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -59,8 +59,8 @@ #include <qtsupport/qtkitinformation.h> #include <qtsupport/uicodemodelsupport.h> #include <qmljstools/qmljsmodelmanager.h> - #include <qmljs/qmljsmodelmanagerinterface.h> +#include <utils/hostosinfo.h> #include <qbs.h> @@ -726,8 +726,12 @@ QString QbsProject::pluginsBaseDirectory() const const QString qbsInstallDir = QLatin1String(QBS_INSTALL_DIR); if (!qbsInstallDir.isEmpty()) return qbsInstallDir + QLatin1String("/lib/"); - return QDir::cleanPath(QCoreApplication::applicationDirPath() - + QLatin1String("/../" IDE_LIBRARY_BASENAME "/qtcreator")); + if (Utils::HostOsInfo::isMacHost()) + return QDir::cleanPath(QCoreApplication::applicationDirPath() + + QLatin1String("/../PlugIns")); + else + return QDir::cleanPath(QCoreApplication::applicationDirPath() + + QLatin1String("/../" IDE_LIBRARY_BASENAME "/qtcreator")); } } // namespace Internal |