forked from qt-creator/qt-creator
Crossify normalizePathName
Denoise usages
get{Short|Long}PathName are now static. They're not used anywhere except
in normalizePathName.
Change-Id: Ief277b6d828faadd98ec7faa39dd682bfaa8805f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
bc81930f17
commit
4de3b94840
@@ -37,11 +37,13 @@
|
||||
#include <coreplugin/editormanager/ieditor.h>
|
||||
#include <coreplugin/icore.h>
|
||||
#include <projectexplorer/target.h>
|
||||
#include <utils/qtcprocess.h>
|
||||
#include <qtsupport/qtkitinformation.h>
|
||||
#include <qtsupport/qtoutputformatter.h>
|
||||
#include <qtsupport/qtsupportconstants.h>
|
||||
|
||||
#include <utils/fileutils.h>
|
||||
#include <utils/qtcprocess.h>
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
#include <utils/winutils.h>
|
||||
#endif
|
||||
@@ -159,13 +161,7 @@ QString QmlProjectRunConfiguration::workingDirectory() const
|
||||
is exactly like the capitalization on disk.*/
|
||||
QString QmlProjectRunConfiguration::canonicalCapsPath(const QString &fileName)
|
||||
{
|
||||
QString canonicalPath = QFileInfo(fileName).canonicalFilePath();
|
||||
|
||||
#if defined(Q_OS_WIN)
|
||||
canonicalPath = Utils::normalizePathName(canonicalPath);
|
||||
#endif
|
||||
|
||||
return canonicalPath;
|
||||
return Utils::FileUtils::normalizePathName(QFileInfo(fileName).canonicalFilePath());
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user