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

RemoteLinux: Fix crash on Windows

Browse Source 
We must not access the X11ForwardingAspect unconditionally, as it only
exists on Linux hosts.

Fixes: QTCREATORBUG-22414
Change-Id: I205d55b5ec318e3a8cae8e27379f84cd6d459ee0
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-05-07 14:37:11 +02:00
parent 7bdb29412c
commit 98e6a21880
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
View File

@@ -104,8 +104,8 @@ QString RemoteLinuxCustomRunConfiguration::runConfigDefaultDisplayName()
Runnable RemoteLinuxCustomRunConfiguration::runnable() const Runnable RemoteLinuxCustomRunConfiguration::runnable() const
{ {
ProjectExplorer::Runnable r = RunConfiguration::runnable(); ProjectExplorer::Runnable r = RunConfiguration::runnable();
r.extraData.insert("Ssh.X11ForwardToDisplay", if (const auto * const forwardingAspect = aspect<X11ForwardingAspect>())
aspect<X11ForwardingAspect>()->display(macroExpander())); r.extraData.insert("Ssh.X11ForwardToDisplay", forwardingAspect->display(macroExpander()));
return r; return r;
} }