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

inline trivial functions

Browse Source
This commit is contained in:
Oswald Buddenhagen
2009-07-23 16:24:35 +02:00
parent 9431850fcd
commit 3399e362cc
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -915,10 +915,10 @@ QStringList ProFileEvaluator::Private::qmakeFeaturePaths()
QStringList feature_roots; QStringList feature_roots;
QByteArray mkspec_path = qgetenv("QMAKEFEATURES"); QByteArray mkspec_path = qgetenv("QMAKEFEATURES");
if (!mkspec_path.isNull()) if (!mkspec_path.isNull())
feature_roots += splitPathList(QString::fromLocal8Bit(mkspec_path)); feature_roots += QString::fromLocal8Bit(mkspec_path).split(Option::dirlist_sep);
/* /*
if (prop) if (prop)
feature_roots += splitPathList(prop->value("QMAKEFEATURES")); feature_roots += prop->value("QMAKEFEATURES").split(Option::dirlist_sep);
if (!Option::mkfile::cachefile.isEmpty()) { if (!Option::mkfile::cachefile.isEmpty()) {
QString path; QString path;
int last_slash = Option::mkfile::cachefile.lastIndexOf(Option::dir_sep); int last_slash = Option::mkfile::cachefile.lastIndexOf(Option::dir_sep);
@@ -931,7 +931,7 @@ QStringList ProFileEvaluator::Private::qmakeFeaturePaths()
QByteArray qmakepath = qgetenv("QMAKEPATH"); QByteArray qmakepath = qgetenv("QMAKEPATH");
if (!qmakepath.isNull()) { if (!qmakepath.isNull()) {
const QStringList lst = splitPathList(QString::fromLocal8Bit(qmakepath)); const QStringList lst = QString::fromLocal8Bit(qmakepath).split(Option::dirlist_sep);
foreach (const QString &item, lst) { foreach (const QString &item, lst) {
foreach (const QString &concat_it, concat) foreach (const QString &concat_it, concat)
feature_roots << (item + mkspecs_concat + concat_it); feature_roots << (item + mkspecs_concat + concat_it);
@@ -2165,7 +2165,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
q->logMessage(format("%1(message) requires one argument.").arg(function)); q->logMessage(format("%1(message) requires one argument.").arg(function));
return ProItem::ReturnFalse; return ProItem::ReturnFalse;
} }
QString msg = fixEnvVariables(args.first()); QString msg = Option::fixString(args.first(), Option::FixEnvVars);
q->fileMessage(QString::fromLatin1("Project %1: %2").arg(function.toUpper(), msg)); q->fileMessage(QString::fromLatin1("Project %1: %2").arg(function.toUpper(), msg));
// ### Consider real termination in non-cumulative mode // ### Consider real termination in non-cumulative mode
return returnBool(function != QLatin1String("error")); return returnBool(function != QLatin1String("error"));

12
src/shared/proparser/proparserutils.h
View File

@@ -147,16 +147,6 @@ static void replaceInList(QStringList *varlist,
} }
} }
inline QString fixEnvVariables(const QString &x)
{
return Option::fixString(x, Option::FixEnvVars);
}
inline QStringList splitPathList(const QString &paths)
{
return paths.split(Option::dirlist_sep);
}
static QStringList split_arg_list(QString params) static QStringList split_arg_list(QString params)
{ {
int quote = 0; int quote = 0;
@@ -262,7 +252,7 @@ static QStringList qmake_mkspec_paths()
const QString concat = QDir::separator() + QString(QLatin1String("mkspecs")); const QString concat = QDir::separator() + QString(QLatin1String("mkspecs"));
QByteArray qmakepath = qgetenv("QMAKEPATH"); QByteArray qmakepath = qgetenv("QMAKEPATH");
if (!qmakepath.isEmpty()) { if (!qmakepath.isEmpty()) {
const QStringList lst = splitPathList(QString::fromLocal8Bit(qmakepath)); const QStringList lst = QString::fromLocal8Bit(qmakepath).split(Option::dirlist_sep);
for (QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it) for (QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it)
ret << ((*it) + concat); ret << ((*it) + concat);
} }