diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-05-02 19:10:45 +0200 |
|---|---|---|
| committer | Sefa Eyeoglu <contact@scrumplex.net> | 2022-07-10 12:17:52 +0200 |
| commit | 984692dc629ca3712d482b174a67557dd9e635a8 (patch) | |
| tree | dca8185a36528d94dd2c93ba8d930908271ca2cc /launcher/launch/steps/PreLaunchCommand.cpp | |
| parent | c1bcbf8c63ef4543fdf0d5529089721d2b4a01dd (diff) | |
| download | PrismLauncher-984692dc629ca3712d482b174a67557dd9e635a8.tar.gz PrismLauncher-984692dc629ca3712d482b174a67557dd9e635a8.tar.bz2 PrismLauncher-984692dc629ca3712d482b174a67557dd9e635a8.zip | |
refactor: fix deprecation up to Qt 5.15
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Diffstat (limited to 'launcher/launch/steps/PreLaunchCommand.cpp')
| -rw-r--r-- | launcher/launch/steps/PreLaunchCommand.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/launcher/launch/steps/PreLaunchCommand.cpp b/launcher/launch/steps/PreLaunchCommand.cpp index 1a0889c8..d3660b30 100644 --- a/launcher/launch/steps/PreLaunchCommand.cpp +++ b/launcher/launch/steps/PreLaunchCommand.cpp @@ -28,9 +28,18 @@ PreLaunchCommand::PreLaunchCommand(LaunchTask *parent) : LaunchStep(parent) void PreLaunchCommand::executeTask() { //FIXME: where to put this? +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) + auto args = QProcess::splitCommand(m_command); + m_parent->substituteVariables(args); + + emit logLine(tr("Running Pre-Launch command: %1").arg(args.join(' ')), MessageLevel::Launcher); + const QString program = args.takeFirst(); + m_process.start(program, args); +#else QString prelaunch_cmd = m_parent->substituteVariables(m_command); emit logLine(tr("Running Pre-Launch command: %1").arg(prelaunch_cmd), MessageLevel::Launcher); m_process.start(prelaunch_cmd); +#endif } void PreLaunchCommand::on_state(LoggedProcess::State state) |