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

Qbs: Add frameworkBuild option to qbs configuration

Browse Source 
Change-Id: Idf9fe91e1a40b86da3d43fe26119ccb7d88ff190
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Tobias Hunger
2013-04-19 15:16:17 +02:00
parent 0b1d227355
commit 96c2b2702c
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
View File

@@ -60,6 +60,7 @@ 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";
const char QTCORE_MKSPEC[] = ".Qt.core.mkspecPath"; const char QTCORE_MKSPEC[] = ".Qt.core.mkspecPath";
const char QTCORE_FRAMEWORKBUILD[] = ".Qt.core.frameworkBuild";
// Toolchain related settings: // Toolchain related settings:
@@ -208,6 +209,7 @@ void QbsManager::addProfileFromKit(const ProjectExplorer::Kit *k)
data.insert(QLatin1String(QTCORE_NAMESPACE), qt->qtNamespace()); data.insert(QLatin1String(QTCORE_NAMESPACE), qt->qtNamespace());
data.insert(QLatin1String(QTCORE_LIBINFIX), qt->qtLibInfix()); data.insert(QLatin1String(QTCORE_LIBINFIX), qt->qtLibInfix());
data.insert(QLatin1String(QTCORE_VERSION), qt->qtVersionString()); data.insert(QLatin1String(QTCORE_VERSION), qt->qtVersionString());
data.insert(QLatin1String(QTCORE_FRAMEWORKBUILD), qt->isFrameworkBuild());
} }
if (ProjectExplorer::SysRootKitInformation::hasSysRoot(k)) if (ProjectExplorer::SysRootKitInformation::hasSysRoot(k))

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

@@ -168,6 +168,7 @@ BaseQtVersion::BaseQtVersion(const FileName &qmakeCommand, bool isAutodetected,
m_mkspecReadUpToDate(false), m_mkspecReadUpToDate(false),
m_defaultConfigIsDebug(true), m_defaultConfigIsDebug(true),
m_defaultConfigIsDebugAndRelease(true), m_defaultConfigIsDebugAndRelease(true),
m_frameworkBuild(false),
m_versionInfoUpToDate(false), m_versionInfoUpToDate(false),
m_installed(true), m_installed(true),
m_hasExamples(false), m_hasExamples(false),
@@ -373,6 +374,11 @@ QString QtSupport::BaseQtVersion::qtLibInfix() const
return m_mkspecValues.value(QLatin1String(MKSPEC_VALUE_LIBINFIX)); return m_mkspecValues.value(QLatin1String(MKSPEC_VALUE_LIBINFIX));
} }
bool BaseQtVersion::isFrameworkBuild() const
{
return m_frameworkBuild;
}
void BaseQtVersion::setId(int id) void BaseQtVersion::setId(int id)
{ {
m_id = id; m_id = id;
@@ -818,6 +824,7 @@ void BaseQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
{ {
QStringList configValues = evaluator->values(QLatin1String("CONFIG")); QStringList configValues = evaluator->values(QLatin1String("CONFIG"));
m_defaultConfigIsDebugAndRelease = false; m_defaultConfigIsDebugAndRelease = false;
m_frameworkBuild = false;
foreach (const QString &value, configValues) { foreach (const QString &value, configValues) {
if (value == QLatin1String("debug")) if (value == QLatin1String("debug"))
m_defaultConfigIsDebug = true; m_defaultConfigIsDebug = true;
@@ -825,6 +832,8 @@ void BaseQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
m_defaultConfigIsDebug = false; m_defaultConfigIsDebug = false;
else if (value == QLatin1String("build_all")) else if (value == QLatin1String("build_all"))
m_defaultConfigIsDebugAndRelease = true; m_defaultConfigIsDebugAndRelease = true;
else if (value == QLatin1String("qt_framework"))
m_frameworkBuild = true;
} }
const QString designerBins = QLatin1String("QT.designer.bins"); const QString designerBins = QLatin1String("QT.designer.bins");
const QString qmlBins = QLatin1String("QT.qml.bins"); const QString qmlBins = QLatin1String("QT.qml.bins");

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

@@ -221,6 +221,7 @@ public:
QString qtNamespace() const; QString qtNamespace() const;
QString qtLibInfix() const; QString qtLibInfix() const;
bool isFrameworkBuild() const;
protected: protected:
BaseQtVersion(); BaseQtVersion();
@@ -257,6 +258,7 @@ private:
mutable bool m_mkspecReadUpToDate; mutable bool m_mkspecReadUpToDate;
mutable bool m_defaultConfigIsDebug; mutable bool m_defaultConfigIsDebug;
mutable bool m_defaultConfigIsDebugAndRelease; mutable bool m_defaultConfigIsDebugAndRelease;
mutable bool m_frameworkBuild;
mutable bool m_versionInfoUpToDate; mutable bool m_versionInfoUpToDate;
mutable bool m_installed; mutable bool m_installed;
mutable bool m_hasExamples; mutable bool m_hasExamples;