forked from qt-creator/qt-creator
Bump minimum Qt version (to build Qt Creator) to 5.11
Recent adaptations to Qt 5.13's API deprecations require using APIs which were introduces in Qt 5.11. Change-Id: I6c077d824c9ce716e019543b290c355a5d512fad Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -436,12 +436,6 @@ bool ConsoleProcess::startTerminalEmulator(QSettings *settings, const QString &w
|
||||
const Utils::Environment &env)
|
||||
{
|
||||
const TerminalCommand term = terminalEmulator(settings);
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
|
||||
// for 5.9 and below we cannot set the environment
|
||||
Q_UNUSED(env);
|
||||
return QProcess::startDetached(term.command, QtcProcess::splitArgs(term.openArgs),
|
||||
workingDir);
|
||||
#else
|
||||
QProcess process;
|
||||
process.setProgram(term.command);
|
||||
process.setArguments(QtcProcess::splitArgs(term.openArgs));
|
||||
@@ -449,7 +443,6 @@ bool ConsoleProcess::startTerminalEmulator(QSettings *settings, const QString &w
|
||||
process.setWorkingDirectory(workingDir);
|
||||
|
||||
return process.startDetached();
|
||||
#endif
|
||||
}
|
||||
|
||||
} // namespace Utils
|
||||
|
||||
Reference in New Issue
Block a user