diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index 9557a997563..a5444559d21 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -58,6 +58,7 @@ QVariantMap DefaultPropertyProvider::properties(const ProjectExplorer::Kit *k, c data.insert(QLatin1String(QTCORE_DOCPATH), qt->docsPath().toUserOutput()); data.insert(QLatin1String(QTCORE_INCPATH), qt->headerPath().toUserOutput()); data.insert(QLatin1String(QTCORE_LIBPATH), qt->libraryPath().toUserOutput()); + data.insert(QLatin1String(QTCORE_PLUGINPATH), qt->pluginPath().toUserOutput()); Utils::FileName mkspecPath = qt->mkspecsPath(); mkspecPath.appendPath(qt->mkspec().toString()); data.insert(QLatin1String(QTCORE_MKSPEC), mkspecPath.toUserOutput()); diff --git a/src/plugins/qbsprojectmanager/qbsconstants.h b/src/plugins/qbsprojectmanager/qbsconstants.h index c5d08d0f1f0..9b8cf7c15f1 100644 --- a/src/plugins/qbsprojectmanager/qbsconstants.h +++ b/src/plugins/qbsprojectmanager/qbsconstants.h @@ -39,6 +39,7 @@ const char QTCORE_BUILDVARIANT[] = "Qt.core.buildVariant"; const char QTCORE_DOCPATH[] = "Qt.core.docPath"; const char QTCORE_INCPATH[] = "Qt.core.incPath"; const char QTCORE_LIBPATH[] = "Qt.core.libPath"; +const char QTCORE_PLUGINPATH[] = "Qt.core.pluginPath"; const char QTCORE_VERSION[] = "Qt.core.version"; const char QTCORE_NAMESPACE[] = "Qt.core.namespace"; const char QTCORE_LIBINFIX[] = "Qt.core.libInfix"; diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index f1464e1aef7..6555f030bfe 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -329,6 +329,11 @@ FileName BaseQtVersion::libraryPath() const return Utils::FileName::fromUserInput(qmakeProperty("QT_INSTALL_LIBS")); } +FileName BaseQtVersion::pluginPath() const +{ + return Utils::FileName::fromUserInput(qmakeProperty("QT_INSTALL_PLUGINS")); +} + FileName BaseQtVersion::binPath() const { return Utils::FileName::fromUserInput(qmakeProperty("QT_HOST_BINS")); diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index ac1fcf51a28..6093488f040 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -224,6 +224,7 @@ public: Utils::FileName headerPath() const; Utils::FileName docsPath() const; Utils::FileName libraryPath() const; + Utils::FileName pluginPath() const; Utils::FileName binPath() const; Utils::FileName mkspecsPath() const;