Differential D9858 Diff 25288 kdevplatform/shell/runtimecontroller.cpp

Changeset View

Standalone View

View Options

kdevplatform/shell/runtimecontroller.cpp

Show All 35 Lines34{
36 36​
37 void startProcess(KProcess *process) const override { 37​ void startProcess(KProcess *process) const override {
38#if QT_VERSION < 0x050600 38​#if QT_VERSION < 0x050600
39 connect(process, static_cast<void(QProcess::*)(QProcess::ProcessError)>(&QProcess::error), 39​ connect(process, static_cast<void(QProcess::*)(QProcess::ProcessError)>(&QProcess::error),
40#else 40​#else
41 connect(process, &QProcess::errorOccurred, 41​ connect(process, &QProcess::errorOccurred,
42#endif 42​#endif
43 this, [process](QProcess::ProcessError error) { 43​ this, [process](QProcess::ProcessError error) {
44 qCWarning(SHELL) << "error:" << error << process->program() << process->errorString(); 44​ qCWarning(SHELL) << "process finished with error:" << error;
45 }); 45​ });
46 process->start(); 46​ process->start();
47 } 47​ }
48 void startProcess(QProcess *process) const override { 48​ void startProcess(QProcess *process) const override {
49#if QT_VERSION < 0x050600 49​#if QT_VERSION < 0x050600
50 connect(process, static_cast<void(QProcess::*)(QProcess::ProcessError)>(&QProcess::error), 50​ connect(process, static_cast<void(QProcess::*)(QProcess::ProcessError)>(&QProcess::error),
51#else 51​#else
52 connect(process, &QProcess::errorOccurred, 52​ connect(process, &QProcess::errorOccurred,
53#endif 53​#endif
54 this, [process](QProcess::ProcessError error) { 54​ this, [process](QProcess::ProcessError error) {
55 qCWarning(SHELL) << "error:" << error << process->program() << process->errorString(); 55​ qCWarning(SHELL) << "process finished with error:" << error;
56 }); 56​ });
57 process->start(); 57​ process->start();
58 } 58​ }
59 KDevelop::Path pathInHost(const KDevelop::Path & runtimePath) const override { return runtimePath; } 59​ KDevelop::Path pathInHost(const KDevelop::Path & runtimePath) const override { return runtimePath; }
60 KDevelop::Path pathInRuntime(const KDevelop::Path & localPath) const override { return localPath; } 60​ KDevelop::Path pathInRuntime(const KDevelop::Path & localPath) const override { return localPath; }
61 void setEnabled(bool /*enabled*/) override {} 61​ void setEnabled(bool /*enabled*/) override {}
62 QByteArray getenv(const QByteArray & varname) const override { return qgetenv(varname.constData()); } 62​ QByteArray getenv(const QByteArray & varname) const override { return qgetenv(varname.constData()); }
63}; 63​};
▲ Show 20 Lines • Show All 102 Lines • Show Last 20 Lines