From dd2bf5d60250906e15122ebd1820fc6be8ca1960 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Wed, 21 Jan 2015 13:32:08 +0100 Subject: [PATCH] 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: Daniel Teske --- src/plugins/qmakeprojectmanager/qmakenodes.cpp | 1 + src/plugins/qmakeprojectmanager/qmakenodes.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index 563856f4a5d..20584262b4c 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -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) { diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.h b/src/plugins/qmakeprojectmanager/qmakenodes.h index 95f672207cf..d04169f1039 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.h +++ b/src/plugins/qmakeprojectmanager/qmakenodes.h @@ -108,7 +108,8 @@ enum QmakeVariable { AndroidArchVar, AndroidDeploySettingsFile, AndroidPackageSourceDir, - AndroidExtraLibs + AndroidExtraLibs, + IsoIconsVar }; // Import base classes into namespace