diff --git a/qtcreator.pro b/qtcreator.pro index cc0c0db48bf5a579fe10d226394713e886df3e4d..8e3676ab14b4f6c8b8d02bf7a988f7cc332fd6fe 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 59bf6d1dd7b0b5b57fae48b4d22e82792d00a523..bbff9bf6686facb7d3dbe07fc829da17116c0969 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