diff options
| author | Martin Smith <martin.smith@digia.com> | 2013-04-30 11:56:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-30 12:45:30 +0200 |
| commit | 08be36c1767b1e8e29938b572ad598a0fea689f1 (patch) | |
| tree | c71306661ac80ea9f0d4f3786a0ba23dc616ce0d /src/tools/qdoc/location.cpp | |
| parent | a2892ad1d7584de62a1356812a4f9348f37e1d29 (diff) | |
qdoc: Config class uses current path for each path var
The Config class is further modified to make
use of the current directory information it
stores with each configuration variable.
Task-number: QTBUG-30725
Change-Id: I34c845e6c05d7868266324f1d54e56f94d709f95
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/tools/qdoc/location.cpp')
| -rw-r--r-- | src/tools/qdoc/location.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/tools/qdoc/location.cpp b/src/tools/qdoc/location.cpp index 91ee214aa1..64a635115e 100644 --- a/src/tools/qdoc/location.cpp +++ b/src/tools/qdoc/location.cpp @@ -243,21 +243,6 @@ QString Location::canonicalRelativePath(const QString &path) return configFileDir.relativeFilePath(canon); } -/*! - \brief Returns \a path which is canonicalized and relative to the \a configDir. - - QDir::relativeFilePath does not canonicalize the paths, so - if the config file is located at qtbase\src\widgets\doc\qtwidgets.qdocconf - and it has a reference to any ancestor folder (e.g. ".." or even "../doc") - */ -QString Location::canonicalRelativePath(const QString &path, const QString &configDir) -{ - QDir configFileDir(configDir); - QDir dir(path); - const QString canon = dir.canonicalPath(); - return configFileDir.relativeFilePath(canon); -} - /*! \fn int Location::lineNo() const Returns the current line number. Must not be called on an empty Location object. |