feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/qds/dev'

Browse Source 
Conflicts: src/libs/utils/filepath.cpp
  src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp
  src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
  tests/unit/unittest/CMakeLists.txt

Change-Id: I017a6075db41a5233487ac855ffe23de2b2bb0ee
This commit is contained in:
Tim Jenssen
2023-03-30 13:34:12 +02:00
parent 6f765181c9 5b28748554
commit adb664f521
858 changed files with 30485 additions and 12280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/filepath.cpp
View File

@@ -1320,13 +1320,13 @@ FilePath FilePath::relativeChildPath(const FilePath &parent) const
}
/*!
Returns the relativePath of FilePath from a given \a anchor.
Returns the relative path of FilePath from a given \a anchor.
Both, FilePath and anchor may be files or directories.
Example usage:
\code
FilePath filePath("/foo/b/ar/file.txt");
FilePath relativePath = filePath.relativePath("/foo/c");
FilePath relativePath = filePath.relativePathFrom("/foo/c");
qDebug() << relativePath
\endcode