diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp index e46436180e1..b5958cce966 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp @@ -60,6 +60,7 @@ const char QTCORE_VERSION[] = ".Qt.core.version"; const char QTCORE_NAMESPACE[] = ".Qt.core.namespace"; const char QTCORE_LIBINFIX[] = ".Qt.core.libInfix"; const char QTCORE_MKSPEC[] = ".Qt.core.mkspecPath"; +const char QTCORE_FRAMEWORKBUILD[] = ".Qt.core.frameworkBuild"; // 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_LIBINFIX), qt->qtLibInfix()); data.insert(QLatin1String(QTCORE_VERSION), qt->qtVersionString()); + data.insert(QLatin1String(QTCORE_FRAMEWORKBUILD), qt->isFrameworkBuild()); } if (ProjectExplorer::SysRootKitInformation::hasSysRoot(k)) diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 579507fea7b..4fc4204c24d 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -168,6 +168,7 @@ BaseQtVersion::BaseQtVersion(const FileName &qmakeCommand, bool isAutodetected, m_mkspecReadUpToDate(false), m_defaultConfigIsDebug(true), m_defaultConfigIsDebugAndRelease(true), + m_frameworkBuild(false), m_versionInfoUpToDate(false), m_installed(true), m_hasExamples(false), @@ -373,6 +374,11 @@ QString QtSupport::BaseQtVersion::qtLibInfix() const return m_mkspecValues.value(QLatin1String(MKSPEC_VALUE_LIBINFIX)); } +bool BaseQtVersion::isFrameworkBuild() const +{ + return m_frameworkBuild; +} + void BaseQtVersion::setId(int id) { m_id = id; @@ -818,6 +824,7 @@ void BaseQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const { QStringList configValues = evaluator->values(QLatin1String("CONFIG")); m_defaultConfigIsDebugAndRelease = false; + m_frameworkBuild = false; foreach (const QString &value, configValues) { if (value == QLatin1String("debug")) m_defaultConfigIsDebug = true; @@ -825,6 +832,8 @@ void BaseQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const m_defaultConfigIsDebug = false; else if (value == QLatin1String("build_all")) m_defaultConfigIsDebugAndRelease = true; + else if (value == QLatin1String("qt_framework")) + m_frameworkBuild = true; } const QString designerBins = QLatin1String("QT.designer.bins"); const QString qmlBins = QLatin1String("QT.qml.bins"); diff --git a/src/plugins/qtsupport/baseqtversion.h b/src/plugins/qtsupport/baseqtversion.h index 1a9c483e3a1..5c5c0b0cd72 100644 --- a/src/plugins/qtsupport/baseqtversion.h +++ b/src/plugins/qtsupport/baseqtversion.h @@ -221,6 +221,7 @@ public: QString qtNamespace() const; QString qtLibInfix() const; + bool isFrameworkBuild() const; protected: BaseQtVersion(); @@ -257,6 +258,7 @@ private: mutable bool m_mkspecReadUpToDate; mutable bool m_defaultConfigIsDebug; mutable bool m_defaultConfigIsDebugAndRelease; + mutable bool m_frameworkBuild; mutable bool m_versionInfoUpToDate; mutable bool m_installed; mutable bool m_hasExamples;