Commit dd2bf5d6 authored by Mitch Curtis's avatar Mitch Curtis Committed by Mitch Curtis

Add IsoIconsVar to QmakeProjectManager::QmakeVariable.

It uses "ISO_ICONS" as its variable name.

This is necessary for the ISO Icon Browser Plugin. A previous attempt
at adding a more generic API to QmakeProFileNode that would allow for
reading and writing custom qmake variables was not sufficient. This is
because qtquickdesigner plugins do not get created until design mode
is entered, meaning that it was too late to register custom qmake
variables via static functions in QmakeProFileNode.

Change-Id: I2c8e0d944a1b9f07d1a7a70bd5e02ea371cf7680
Reviewed-by: default avatarDaniel Teske <daniel.teske@theqtcompany.com>
parent 955ce216
......@@ -1930,6 +1930,7 @@ EvalResult *QmakeProFileNode::evaluate(const EvalInput &input)
result->newVarValues[AndroidDeploySettingsFile] = input.readerExact->values(QLatin1String("ANDROID_DEPLOYMENT_SETTINGS_FILE"));
result->newVarValues[AndroidPackageSourceDir] = input.readerExact->values(QLatin1String("ANDROID_PACKAGE_SOURCE_DIR"));
result->newVarValues[AndroidExtraLibs] = input.readerExact->values(QLatin1String("ANDROID_EXTRA_LIBS"));
result->newVarValues[IsoIconsVar] = input.readerExact->values(QLatin1String("ISO_ICONS"));
result->isDeployable = false;
if (result->projectType == ApplicationTemplate) {
......
......@@ -108,7 +108,8 @@ enum QmakeVariable {
AndroidArchVar,
AndroidDeploySettingsFile,
AndroidPackageSourceDir,
AndroidExtraLibs
AndroidExtraLibs,
IsoIconsVar
};
// Import base classes into namespace
......
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