Commit e822d570 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

process QMAKE_CXXFLAGS_{APP|SHLIB|PLUGIN}



qmake helpfully hard-codes this processing in the generators instead of
letting default_pro & co. handle it, so we must explicitly reproduce it.

Task-number: <ask nikolai>
Change-Id: Ia42c727291b28cf4b01f11e464d2244ce1fb53dd
Reviewed-by: default avatarDaniel Teske <daniel.teske@theqtcompany.com>
parent 5a9a24fa
......@@ -213,6 +213,25 @@ bool ProFileEvaluator::accept(ProFile *pro, QMakeEvaluator::LoadFlags flags)
}
// The location of this is inconsistent among generators.
incpath << ProString(d->m_qmakespec);
// We ignore CFLAGS and LFLAGS, as they are not used higher up anyway.
ProStringList &cxxflags = d->valuesRef(ProKey("QMAKE_CXXFLAGS"));
switch (templateType()) {
case TT_Application:
cxxflags += d->values(ProKey("QMAKE_CXXFLAGS_APP"));
break;
case TT_Library:
if (d->isActiveConfig(QStringLiteral("dll"))) {
bool plugin = d->isActiveConfig(QStringLiteral("plugin"));
if (!plugin || !d->isActiveConfig(QStringLiteral("plugin_no_share_shlib_cflags")))
cxxflags += d->values(ProKey("QMAKE_CXXFLAGS_SHLIB"));
if (plugin)
cxxflags += d->values(ProKey("QMAKE_CXXFLAGS_PLUGIN"));
}
break;
default:
break;
}
}
return true;
......
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