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

Fix crash in include completion with non-canonical include paths

Browse Source 
Use QFileInfo::fileName() to get the filename, since that also works
when the original path wasn't canonical.
(cherry picked from commit 51d2c831b9)
This commit is contained in:
Thorbjørn Lindeijer
2009-08-20 19:38:43 +02:00
committed by con
parent 904a6ec623
commit 39c1755b3d
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -1119,11 +1119,7 @@ void CppModelManager::updateIncludesInPaths(QFutureInterface<void> &future,
const QFileInfo fileInfo = i.fileInfo(); const QFileInfo fileInfo = i.fileInfo();
const QString suffix = fileInfo.suffix(); const QString suffix = fileInfo.suffix();
if (suffix.isEmpty() || suffixes.contains(suffix)) { if (suffix.isEmpty() || suffixes.contains(suffix)) {
QString text = fileName.mid(path.length() + 1); QString text = fileInfo.fileName();
if (text.isEmpty()) {
qWarning() << Q_FUNC_INFO << "Empty filename?" << path << fileName;
continue;
}
if (fileInfo.isDir()) { if (fileInfo.isDir()) {
text += QLatin1Char('/'); text += QLatin1Char('/');

2
src/plugins/cpptools/cppmodelmanagerinterface.h
View File

@@ -41,7 +41,7 @@ namespace ProjectExplorer {
} }
namespace CppTools { namespace CppTools {
class AbstractEditorSupport; class AbstractEditorSupport;
class CPPTOOLS_EXPORT CppModelManagerInterface : public QObject class CPPTOOLS_EXPORT CppModelManagerInterface : public QObject