whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdoc: Clean path names before using them 

The excludedirs variable doesn't work correctly when its values have
'../' in them. The solution is to use QDir::cleanPath() on each path
name before using it.

Task Nr: QTBUG-26492

Change-Id: I2db74e79cf096c1c75ab5b10877320360c016fc7
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
bb10
Martin Smith 2012-07-12 10:15:55 +02:00 committed by Qt by Nokia
parent 770e1d30a2
commit 8ca17ed943
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/qdoc/config.cpp
View File

@ -219,7 +219,6 @@ void Config::unload(const QString& fileName)
}
qDebug() << "fileName:" << fileName;
}
/*!
Joins all the strings in \a values into a single string with the
individual \a values separated by ' '. Then it inserts the result
@ -931,11 +930,12 @@ void Config::load(Location location, const QString& fileName)
}
}
QStringList Config::getFilesHere(const QString& dir,
QStringList Config::getFilesHere(const QString& uncleanDir,
const QString& nameFilter,
const QSet<QString> &excludedDirs,
const QSet<QString> &excludedFiles)
{
QString dir = QDir::cleanPath(uncleanDir);
QStringList result;
if (excludedDirs.contains(dir))
return result;

2
src/tools/qdoc/location.cpp
View File

@ -60,7 +60,7 @@ QRegExp *Location::spuriousRegExp = 0;
/*!
\class Location
\brief The Location class keeps track of where we are in a file.
\brief The Location class provides a way to mark a location in a file.
It maintains a stack of file positions. A file position
consists of the file path, line number, and column number.