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

FileInProjectFinder: Fix compilation with 4.7.4

Browse Source 
Don't depend on QUrl::isLocalFile, which only exists in 4.8.

Change-Id: I67a8e35c8754396424c5578216bc6deb02ae0d50
Reviewed-on: http://codereview.qt.nokia.com/1959
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Kai Koehne
2011-07-21 15:32:20 +02:00
parent d50f99cb27
commit 372b10db87
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/utils/fileinprojectfinder.cpp
View File

@@ -98,13 +98,9 @@ void FileInProjectFinder::setProjectFiles(const QStringList &projectFiles)
*/ */
QString FileInProjectFinder::findFile(const QUrl &fileUrl, bool *success) const QString FileInProjectFinder::findFile(const QUrl &fileUrl, bool *success) const
{ {
QString originalPath; QString originalPath = fileUrl.toLocalFile();
if (fileUrl.isLocalFile()) { if (originalPath.isEmpty()) // e.g. qrc://
originalPath = fileUrl.toLocalFile();
} else {
// strip e.g. leading qrc://
originalPath = fileUrl.path(); originalPath = fileUrl.path();
}
if (originalPath.isEmpty()) { if (originalPath.isEmpty()) {
if (success) if (success)