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

ProjectExplorer: Drop workaround for Qt 4.7.1 bug

Browse Source 
This was introduced for QTBUG-17529.

Change-Id: I4cbf63b0118b5bfe063501a547687a2f0c8cc94b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2022-05-23 14:33:44 +02:00
parent ce76fb11b3
commit af1351d27b
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/projectexplorer/runcontrol.cpp
View File

@@ -1402,10 +1402,6 @@ void SimpleTargetRunnerPrivate::start()
m_resultData = {}; m_resultData = {};
if (m_isLocal) { if (m_isLocal) {
// Work around QTBUG-17529 (QtDeclarative fails with 'File name case mismatch' ...)
const FilePath fixedPath = m_runnable.workingDirectory.normalizedPathName();
m_process.setWorkingDirectory(fixedPath);
Environment env = m_runnable.environment; Environment env = m_runnable.environment;
if (m_runAsRoot) if (m_runAsRoot)
RunControl::provideAskPassEntry(env); RunControl::provideAskPassEntry(env);
@@ -1449,11 +1445,12 @@ void SimpleTargetRunnerPrivate::start()
m_stopRequested = false; m_stopRequested = false;
m_process.setCommand(m_runnable.command); m_process.setCommand(m_runnable.command);
m_process.setWorkingDirectory(m_runnable.workingDirectory);
m_process.setEnvironment(m_runnable.environment); m_process.setEnvironment(m_runnable.environment);
m_process.setExtraData(m_runnable.extraData); m_process.setExtraData(m_runnable.extraData);
} }
m_process.setWorkingDirectory(m_runnable.workingDirectory);
if (m_isLocal) if (m_isLocal)
m_outputCodec = QTextCodec::codecForLocale(); m_outputCodec = QTextCodec::codecForLocale();
else else