1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make splitPathList() return an empty list for an empty string

Browse Source 
this makes the user code a bit cleaner

Change-Id: I3713c73c5c19cf69341be65480917eda0b967b77
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-03-12 17:24:47 +01:00
parent f4b7e33c0b
commit ad92c6c7de
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/option.h
View File

@ -218,7 +218,7 @@ private:
}; };
inline QString fixEnvVariables(const QString &x) { return Option::fixString(x, Option::FixEnvVars); } inline QString fixEnvVariables(const QString &x) { return Option::fixString(x, Option::FixEnvVars); }
inline QStringList splitPathList(const QString &paths) { return paths.split(Option::dirlist_sep); } inline QStringList splitPathList(const QString &paths) { return paths.isEmpty() ? QStringList() : paths.split(Option::dirlist_sep); }
QT_END_NAMESPACE QT_END_NAMESPACE

28
qmake/project.cpp
View File

@ -586,10 +586,7 @@ QStringList qmake_feature_paths(QMakeProperty *prop, bool host_build)
concat << base_concat; concat << base_concat;
} }
QStringList feature_roots; QStringList feature_roots = splitPathList(QString::fromLocal8Bit(qgetenv("QMAKEFEATURES")));
QByteArray mkspec_path = qgetenv("QMAKEFEATURES");
if(!mkspec_path.isNull())
feature_roots += splitPathList(QString::fromLocal8Bit(mkspec_path));
if(prop) if(prop)
feature_roots += splitPathList(prop->value("QMAKEFEATURES")); feature_roots += splitPathList(prop->value("QMAKEFEATURES"));
if(!Option::mkfile::cachefile.isEmpty()) { if(!Option::mkfile::cachefile.isEmpty()) {
@ -601,15 +598,10 @@ QStringList qmake_feature_paths(QMakeProperty *prop, bool host_build)
concat_it != concat.end(); ++concat_it) concat_it != concat.end(); ++concat_it)
feature_roots << (path + (*concat_it)); feature_roots << (path + (*concat_it));
} }
QByteArray qmakepath = qgetenv("QMAKEPATH"); QStringList qmakepath = splitPathList(QString::fromLocal8Bit(qgetenv("QMAKEPATH")));
if (!qmakepath.isNull()) { foreach (const QString &path, qmakepath)
const QStringList lst = splitPathList(QString::fromLocal8Bit(qmakepath)); foreach (const QString &cat, concat)
for(QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it) { feature_roots << (path + mkspecs_concat + cat);
for(QStringList::Iterator concat_it = concat.begin();
concat_it != concat.end(); ++concat_it)
feature_roots << ((*it) + mkspecs_concat + (*concat_it));
}
}
QString *specp = host_build ? &Option::mkfile::qmakespec : &Option::mkfile::xqmakespec; QString *specp = host_build ? &Option::mkfile::qmakespec : &Option::mkfile::xqmakespec;
if (!specp->isEmpty()) { if (!specp->isEmpty()) {
// The spec is already platform-dependent, so no subdirs here. // The spec is already platform-dependent, so no subdirs here.
@ -643,12 +635,10 @@ QStringList qmake_mkspec_paths()
{ {
QStringList ret; QStringList ret;
const QString concat = QLatin1String("/mkspecs"); const QString concat = QLatin1String("/mkspecs");
QByteArray qmakepath = qgetenv("QMAKEPATH");
if (!qmakepath.isEmpty()) { QStringList qmakepath = splitPathList(QString::fromLocal8Bit(qgetenv("QMAKEPATH")));
const QStringList lst = splitPathList(QString::fromLocal8Bit(qmakepath)); foreach (const QString &path, qmakepath)
for (QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it) ret << (path + concat);
ret << ((*it) + concat);
}
if (!project_build_root.isEmpty()) if (!project_build_root.isEmpty())
ret << project_build_root + concat; ret << project_build_root + concat;
if (!project_root.isEmpty()) if (!project_root.isEmpty())