Commit b6b220ea authored by Tobias Hunger's avatar Tobias Hunger Committed by Eike Ziller
Browse files

Qbs: Fix Qt namespace and Qt libinfix support



Change-Id: Ic592b588d257f369738ff2f90480091576bfa7a8
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent e920010e
......@@ -67,6 +67,9 @@ static const char QTVERSIONAUTODETECTED[] = "isAutodetected";
static const char QTVERSIONAUTODETECTIONSOURCE []= "autodetectionSource";
static const char QTVERSIONQMAKEPATH[] = "QMakePath";
static const char MKSPEC_VALUE_LIBINFIX[] = "QT_LIBINFIX";
static const char MKSPEC_VALUE_NAMESPACE[] = "QT_NAMESPACE";
///////////////
// QtVersionNumber
///////////////
......@@ -370,12 +373,14 @@ Utils::FileName QtSupport::BaseQtVersion::mkspecsPath() const
QString QtSupport::BaseQtVersion::qtNamespace() const
{
return qmakeProperty("QT_NAMESPACE");
ensureMkSpecParsed();
return m_mkspecValues.value(QLatin1String(MKSPEC_VALUE_NAMESPACE));
}
QString QtSupport::BaseQtVersion::qtLibInfix() const
{
return qmakeProperty("QT_LIBINFIX");
ensureMkSpecParsed();
return m_mkspecValues.value(QLatin1String(MKSPEC_VALUE_LIBINFIX));
}
void BaseQtVersion::setId(int id)
......@@ -834,9 +839,13 @@ void BaseQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
const QString designerBins = QLatin1String("QT.designer.bins");
const QString qmlBins = QLatin1String("QT.qml.bins");
const QString declarativeBins = QLatin1String("QT.declarative.bins");
const QString libinfix = QLatin1String(MKSPEC_VALUE_LIBINFIX);
const QString ns = QLatin1String(MKSPEC_VALUE_NAMESPACE);
m_mkspecValues.insert(designerBins, evaluator->value(designerBins));
m_mkspecValues.insert(qmlBins, evaluator->value(qmlBins));
m_mkspecValues.insert(declarativeBins, evaluator->value(declarativeBins));
m_mkspecValues.insert(libinfix, evaluator->value(libinfix));
m_mkspecValues.insert(ns, evaluator->value(ns));
}
FileName BaseQtVersion::mkspec() const
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment