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

Export Qt plugin path to QBS configuration.

Browse Source 
Change-Id: I14c4315b6a5029723c2940c05160551361b91dd3
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Jake Petroules
2013-08-26 07:34:46 -04:00
committed by Tobias Hunger
parent 00a80839b3
commit be0022d495
4 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
View File

@@ -58,6 +58,7 @@ QVariantMap DefaultPropertyProvider::properties(const ProjectExplorer::Kit *k, c
data.insert(QLatin1String(QTCORE_DOCPATH), qt->docsPath().toUserOutput()); data.insert(QLatin1String(QTCORE_DOCPATH), qt->docsPath().toUserOutput());
data.insert(QLatin1String(QTCORE_INCPATH), qt->headerPath().toUserOutput()); data.insert(QLatin1String(QTCORE_INCPATH), qt->headerPath().toUserOutput());
data.insert(QLatin1String(QTCORE_LIBPATH), qt->libraryPath().toUserOutput()); data.insert(QLatin1String(QTCORE_LIBPATH), qt->libraryPath().toUserOutput());
data.insert(QLatin1String(QTCORE_PLUGINPATH), qt->pluginPath().toUserOutput());
Utils::FileName mkspecPath = qt->mkspecsPath(); Utils::FileName mkspecPath = qt->mkspecsPath();
mkspecPath.appendPath(qt->mkspec().toString()); mkspecPath.appendPath(qt->mkspec().toString());
data.insert(QLatin1String(QTCORE_MKSPEC), mkspecPath.toUserOutput()); data.insert(QLatin1String(QTCORE_MKSPEC), mkspecPath.toUserOutput());

1
src/plugins/qbsprojectmanager/qbsconstants.h
View File

@@ -39,6 +39,7 @@ const char QTCORE_BUILDVARIANT[] = "Qt.core.buildVariant";
const char QTCORE_DOCPATH[] = "Qt.core.docPath"; const char QTCORE_DOCPATH[] = "Qt.core.docPath";
const char QTCORE_INCPATH[] = "Qt.core.incPath"; const char QTCORE_INCPATH[] = "Qt.core.incPath";
const char QTCORE_LIBPATH[] = "Qt.core.libPath"; const char QTCORE_LIBPATH[] = "Qt.core.libPath";
const char QTCORE_PLUGINPATH[] = "Qt.core.pluginPath";
const char QTCORE_VERSION[] = "Qt.core.version"; const char QTCORE_VERSION[] = "Qt.core.version";
const char QTCORE_NAMESPACE[] = "Qt.core.namespace"; const char QTCORE_NAMESPACE[] = "Qt.core.namespace";
const char QTCORE_LIBINFIX[] = "Qt.core.libInfix"; const char QTCORE_LIBINFIX[] = "Qt.core.libInfix";

5
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -329,6 +329,11 @@ FileName BaseQtVersion::libraryPath() const
return Utils::FileName::fromUserInput(qmakeProperty("QT_INSTALL_LIBS")); return Utils::FileName::fromUserInput(qmakeProperty("QT_INSTALL_LIBS"));
} }
FileName BaseQtVersion::pluginPath() const
{
return Utils::FileName::fromUserInput(qmakeProperty("QT_INSTALL_PLUGINS"));
}
FileName BaseQtVersion::binPath() const FileName BaseQtVersion::binPath() const
{ {
return Utils::FileName::fromUserInput(qmakeProperty("QT_HOST_BINS")); return Utils::FileName::fromUserInput(qmakeProperty("QT_HOST_BINS"));

1
src/plugins/qtsupport/baseqtversion.h
View File

@@ -224,6 +224,7 @@ public:
Utils::FileName headerPath() const; Utils::FileName headerPath() const;
Utils::FileName docsPath() const; Utils::FileName docsPath() const;
Utils::FileName libraryPath() const; Utils::FileName libraryPath() const;
Utils::FileName pluginPath() const;
Utils::FileName binPath() const; Utils::FileName binPath() const;
Utils::FileName mkspecsPath() const; Utils::FileName mkspecsPath() const;