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

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Conflicts:
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h

Change-Id: I192b9e88f967182f3275b4b98abed1220c26daac
This commit is contained in:
Eike Ziller
2018-05-28 16:10:23 +02:00
parent 005b0c1147 c1c57f0c38
commit c8c6b28e22
206 changed files with 2634 additions and 1715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmljseditor/qmljspreviewrunner.cpp
View File

@@ -27,7 +27,7 @@
#include <coreplugin/icore.h>
#include <projectexplorer/runnables.h>
#include <projectexplorer/runconfiguration.h>
#include <utils/environment.h>
#include <utils/hostosinfo.h>
@@ -59,7 +59,7 @@ void QmlJSPreviewRunner::run(const QString &filename)
{
QString errorMessage;
if (!filename.isEmpty()) {
ProjectExplorer::StandardRunnable r;
ProjectExplorer::Runnable r;
r.environment = Utils::Environment::systemEnvironment();
r.runMode = ProjectExplorer::ApplicationLauncher::Gui;
r.executable = m_qmlViewerDefaultPath;