Commit fc421df1 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

micro-optimizations

parent be1e0d2d
......@@ -522,9 +522,9 @@ void Qt4PriFileNode::update(ProFile *includeFileExact, ProFileReader *readerExac
newFilePaths += readerCumulative->absoluteFileValues(qmakeVariable, projectDir, vPathsCumulative, includeFileCumlative);
}
newFilePaths.removeDuplicates();
if (!newFilePaths.isEmpty()) {
newFilePaths.removeDuplicates();
InternalNode *subfolder = new InternalNode;
subfolder->type = type;
subfolder->icon = fileTypes.at(i).icon;
......@@ -1444,14 +1444,14 @@ QStringList Qt4ProFileNode::subDirsPaths(ProFileReader *reader) const
}
if (QFile::exists(realFile)) {
if (!subProjectPaths.contains(realFile))
subProjectPaths << realFile;
subProjectPaths << realFile;
} else {
m_project->proFileParseError(tr("Could not find .pro file for sub dir '%1' in '%2'")
.arg(subDirVar).arg(realDir));
}
}
subProjectPaths.removeDuplicates();
return subProjectPaths;
}
......
......@@ -2468,7 +2468,7 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction(
#endif
case T_EVAL: {
ProBlock *pro = new ProBlock();
QString buf = args.join(QLatin1String(" "));
QString buf = args.join(statics.field_sep);
if (!readInternal(pro, buf, (ushort*)buf.data())) {
delete pro;
return ProItem::ReturnFalse;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment