comparison plugin/PluginPathSetter.cpp @ 1482:c014839f49c7 plugin-path-config

Record path associated with first helper found for a plugin, not last (so native helper in preference to 32-bit helper). Also more debug output
author Chris Cannam
date Mon, 11 Jun 2018 11:34:11 +0100
parents 75fe1c1e003f
children
comparison
equal deleted inserted replaced
1481:75fe1c1e003f 1482:c014839f49c7
250 string currentValue; 250 string currentValue;
251 getEnvUtf8(envVarStr, currentValue); 251 getEnvUtf8(envVarStr, currentValue);
252 m_originalEnvValues[envVariable] = QString::fromStdString(currentValue); 252 m_originalEnvValues[envVariable] = QString::fromStdString(currentValue);
253 if (currentValue != "" && p.second.useEnvVariable) { 253 if (currentValue != "" && p.second.useEnvVariable) {
254 // don't override 254 // don't override
255 SVDEBUG << "PluginPathSetter: for environment variable "
256 << envVariable << ", useEnvVariable setting is false; "
257 << "leaving current value alone: it is \""
258 << currentValue << "\"" << endl;
255 continue; 259 continue;
256 } 260 }
257 QString separator = 261 QString separator =
258 #ifdef Q_OS_WIN 262 #ifdef Q_OS_WIN
259 ";" 263 ";"
260 #else 264 #else
261 ":" 265 ":"
262 #endif 266 #endif
263 ; 267 ;
264 QString proposedValue = p.second.directories.join(separator); 268 QString proposedValue = p.second.directories.join(separator);
269 SVDEBUG << "PluginPathSetter: for environment variable "
270 << envVariable << ", useEnvVariable setting is true or "
271 << "variable is currently unset; "
272 << "changing value from \"" << currentValue
273 << "\" to setting preference of \"" << proposedValue
274 << "\"" << endl;
265 putEnvUtf8(envVarStr, proposedValue.toStdString()); 275 putEnvUtf8(envVarStr, proposedValue.toStdString());
266 } 276 }
267 } 277 }
268 278