From 08be36c1767b1e8e29938b572ad598a0fea689f1 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Tue, 30 Apr 2013 11:56:35 +0200 Subject: 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 --- src/tools/qdoc/location.cpp | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src/tools/qdoc/location.cpp') 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. -- cgit v1.2.3