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

Merge remote-tracking branch 'origin/3.0'

Browse Source
This commit is contained in:
Eike Ziller
2013-10-29 08:17:05 +01:00
parent cd041f3f93 b926435576
commit 242b7bd209
155 changed files with 3464 additions and 2565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cpptools/cpptoolsplugin.cpp
View File

@@ -51,11 +51,9 @@
#include <coreplugin/vcsmanager.h>
#include <cppeditor/cppeditorconstants.h>
#include <utils/fileutils.h>
#include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
#ifdef Q_OS_WIN
#include <utils/winutils.h>
#endif
#include <QtPlugin>
#include <QFileInfo>
@@ -352,11 +350,7 @@ QString correspondingHeaderOrSource(const QString &fileName, bool *wasHeader)
foreach (const QString &candidateDir, candidateDirs) {
foreach (const QString &candidateFileName, candidateFileNames) {
const QString candidateFilePath = candidateDir + QLatin1Char('/') + candidateFileName;
#ifdef Q_OS_WIN
const QString normalized = Utils::normalizePathName(candidateFilePath);
#else
const QString normalized = candidateFilePath;
#endif
const QString normalized = Utils::FileUtils::normalizePathName(candidateFilePath);
const QFileInfo candidateFi(normalized);
if (candidateFi.isFile()) {
m_headerSourceMapping[fi.absoluteFilePath()] = candidateFi.absoluteFilePath();