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
@@ -43,7 +43,6 @@
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
# include "shared/peutils.h"
|
||||
# include <utils/winutils.h>
|
||||
#endif
|
||||
|
||||
#include <projectexplorer/localapplicationrunconfiguration.h> // For LocalApplication*
|
||||
@@ -55,6 +54,7 @@
|
||||
#include <projectexplorer/taskhub.h>
|
||||
|
||||
#include <utils/checkablemessagebox.h>
|
||||
#include <utils/fileutils.h>
|
||||
#include <utils/qtcassert.h>
|
||||
#include <utils/qtcprocess.h>
|
||||
#include <coreplugin/icore.h>
|
||||
@@ -344,12 +344,9 @@ static DebuggerStartParameters localStartParameters(RunConfiguration *runConfigu
|
||||
if (!fillParameters(&sp, kit, errorMessage))
|
||||
return sp;
|
||||
sp.environment = environment->environment();
|
||||
sp.workingDirectory = rc->workingDirectory();
|
||||
|
||||
#if defined(Q_OS_WIN)
|
||||
// Work around QTBUG-17529 (QtDeclarative fails with 'File name case mismatch' ...)
|
||||
sp.workingDirectory = normalizePathName(sp.workingDirectory);
|
||||
#endif
|
||||
// Normalize to work around QTBUG-17529 (QtDeclarative fails with 'File name case mismatch'...)
|
||||
sp.workingDirectory = FileUtils::normalizePathName(rc->workingDirectory());
|
||||
|
||||
sp.executable = rc->executable();
|
||||
if (sp.executable.isEmpty())
|
||||
|
Reference in New Issue
Block a user