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

don't crash during setup without valid qt configuration

Browse Source 
there is not much point in complaining about internal queries of unknown
properties anyway, so just don't try it.
remove the default value from the complain argument to avoid mistakes
either way in the future.
This commit is contained in:
Oswald Buddenhagen
2010-06-25 12:08:10 +02:00
parent 6493b4853d
commit 1fd8672e40
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/shared/proparser/profileevaluator.cpp
View File

@@ -158,7 +158,7 @@ public:
ProStringList &valuesRef(const ProString &variableName); ProStringList &valuesRef(const ProString &variableName);
ProStringList valuesDirect(const ProString &variableName) const; ProStringList valuesDirect(const ProString &variableName) const;
ProStringList values(const ProString &variableName) const; ProStringList values(const ProString &variableName) const;
QString propertyValue(const QString &val, bool complain = true) const; QString propertyValue(const QString &val, bool complain) const;
static ProStringList split_value_list(const QString &vals); static ProStringList split_value_list(const QString &vals);
bool isActiveConfig(const QString &config, bool regex = false); bool isActiveConfig(const QString &config, bool regex = false);
@@ -694,7 +694,7 @@ void ProFileEvaluator::Private::evaluateExpression(
break; break;
case TokProperty: case TokProperty:
addStr(ProString(propertyValue( addStr(ProString(propertyValue(
getStr(tokPtr).toQString(m_tmp1)), NoHash), ret, pending, joined); getStr(tokPtr).toQString(m_tmp1), true), NoHash), ret, pending, joined);
break; break;
case TokEnvVar: case TokEnvVar:
addStrList(split_value_list(QString::fromLocal8Bit(qgetenv( addStrList(split_value_list(QString::fromLocal8Bit(qgetenv(
@@ -1322,7 +1322,7 @@ QStringList ProFileEvaluator::Private::qmakeMkspecPaths() const
foreach (const QString &it, QString::fromLocal8Bit(qmakepath).split(m_option->dirlist_sep)) foreach (const QString &it, QString::fromLocal8Bit(qmakepath).split(m_option->dirlist_sep))
ret << QDir::cleanPath(it) + concat; ret << QDir::cleanPath(it) + concat;
QString builtIn = propertyValue(QLatin1String("QT_INSTALL_DATA")) + concat; QString builtIn = propertyValue(QLatin1String("QT_INSTALL_DATA"), false) + concat;
if (!ret.contains(builtIn)) if (!ret.contains(builtIn))
ret << builtIn; ret << builtIn;
@@ -1400,10 +1400,10 @@ QStringList ProFileEvaluator::Private::qmakeFeaturePaths() const
} }
foreach (const QString &concat_it, concat) foreach (const QString &concat_it, concat)
feature_roots << (propertyValue(QLatin1String("QT_INSTALL_PREFIX")) + feature_roots << (propertyValue(QLatin1String("QT_INSTALL_PREFIX"), false) +
mkspecs_concat + concat_it); mkspecs_concat + concat_it);
foreach (const QString &concat_it, concat) foreach (const QString &concat_it, concat)
feature_roots << (propertyValue(QLatin1String("QT_INSTALL_DATA")) + feature_roots << (propertyValue(QLatin1String("QT_INSTALL_DATA"), false) +
mkspecs_concat + concat_it); mkspecs_concat + concat_it);
for (int i = 0; i < feature_roots.count(); ++i) for (int i = 0; i < feature_roots.count(); ++i)
@@ -1639,7 +1639,7 @@ ProStringList ProFileEvaluator::Private::expandVariableReferences(
replacement = split_value_list(QString::fromLocal8Bit(qgetenv( replacement = split_value_list(QString::fromLocal8Bit(qgetenv(
var.toQString(m_tmp1).toLocal8Bit().constData()))); var.toQString(m_tmp1).toLocal8Bit().constData())));
} else if (var_type == PROPERTY) { } else if (var_type == PROPERTY) {
replacement << ProString(propertyValue(var.toQString(m_tmp1)), NoHash); replacement << ProString(propertyValue(var.toQString(m_tmp1), true), NoHash);
} else if (var_type == FUNCTION) { } else if (var_type == FUNCTION) {
replacement += evaluateExpandFunction(var, args); replacement += evaluateExpandFunction(var, args);
} else if (var_type == VAR) { } else if (var_type == VAR) {