forked from qt-creator/qt-creator
Fix crash in include completion with non-canonical include paths
Use QFileInfo::fileName() to get the filename, since that also works when the original path wasn't canonical.
This commit is contained in:
@@ -1119,11 +1119,7 @@ void CppModelManager::updateIncludesInPaths(QFutureInterface<void> &future,
|
||||
const QFileInfo fileInfo = i.fileInfo();
|
||||
const QString suffix = fileInfo.suffix();
|
||||
if (suffix.isEmpty() || suffixes.contains(suffix)) {
|
||||
QString text = fileName.mid(path.length() + 1);
|
||||
if (text.isEmpty()) {
|
||||
qWarning() << Q_FUNC_INFO << "Empty filename?" << path << fileName;
|
||||
continue;
|
||||
}
|
||||
QString text = fileInfo.fileName();
|
||||
if (fileInfo.isDir()) {
|
||||
text += QLatin1Char('/');
|
||||
|
||||
|
@@ -41,7 +41,7 @@ namespace ProjectExplorer {
|
||||
}
|
||||
|
||||
namespace CppTools {
|
||||
|
||||
|
||||
class AbstractEditorSupport;
|
||||
|
||||
class CPPTOOLS_EXPORT CppModelManagerInterface : public QObject
|
||||
|
Reference in New Issue
Block a user