feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Add IsoIconsVar to QmakeProjectManager::QmakeVariable.

Browse Source 
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 <daniel.teske@theqtcompany.com>
This commit is contained in:
Mitch Curtis
2015-01-21 13:32:08 +01:00
committed by Mitch Curtis
parent 955ce2169f
commit dd2bf5d602
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmakeprojectmanager/qmakenodes.cpp
View File

@@ -1930,6 +1930,7 @@ EvalResult *QmakeProFileNode::evaluate(const EvalInput &input)
result->newVarValues[AndroidDeploySettingsFile] = input.readerExact->values(QLatin1String("ANDROID_DEPLOYMENT_SETTINGS_FILE")); result->newVarValues[AndroidDeploySettingsFile] = input.readerExact->values(QLatin1String("ANDROID_DEPLOYMENT_SETTINGS_FILE"));
result->newVarValues[AndroidPackageSourceDir] = input.readerExact->values(QLatin1String("ANDROID_PACKAGE_SOURCE_DIR")); result->newVarValues[AndroidPackageSourceDir] = input.readerExact->values(QLatin1String("ANDROID_PACKAGE_SOURCE_DIR"));
result->newVarValues[AndroidExtraLibs] = input.readerExact->values(QLatin1String("ANDROID_EXTRA_LIBS")); result->newVarValues[AndroidExtraLibs] = input.readerExact->values(QLatin1String("ANDROID_EXTRA_LIBS"));
result->newVarValues[IsoIconsVar] = input.readerExact->values(QLatin1String("ISO_ICONS"));
result->isDeployable = false; result->isDeployable = false;
if (result->projectType == ApplicationTemplate) { if (result->projectType == ApplicationTemplate) {

3
src/plugins/qmakeprojectmanager/qmakenodes.h
View File

@@ -108,7 +108,8 @@ enum QmakeVariable {
AndroidArchVar, AndroidArchVar,
AndroidDeploySettingsFile, AndroidDeploySettingsFile,
AndroidPackageSourceDir, AndroidPackageSourceDir,
AndroidExtraLibs AndroidExtraLibs,
IsoIconsVar
}; };
// Import base classes into namespace // Import base classes into namespace