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

QmlDesigner: use current file to start preview

Browse Source 
- Maybe we need a check if it is a qml file.

Task-number: QDS-1299
Change-Id: I2b54514f311fb78d3508e588783c0d04c7a7bc0b
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tim Jenssen
2019-12-10 16:25:41 +01:00
parent 266c808117
commit fb171ebc5b
4 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/qmlpreview/qmlpreviewruncontrol.cpp
View File

@@ -25,6 +25,9 @@
#include "qmlpreviewruncontrol.h"
#include <qmlprojectmanager/qmlproject.h>
#include <qmlprojectmanager/qmlmainfileaspect.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/session.h>
#include <projectexplorer/target.h>
@@ -36,6 +39,7 @@
#include <utils/port.h>
#include <utils/qtcprocess.h>
#include <utils/url.h>
#include <utils/fileutils.h>
namespace QmlPreview {
@@ -77,7 +81,7 @@ QmlPreviewRunner::QmlPreviewRunner(ProjectExplorer::RunControl *runControl,
if (!runControl->isRunning())
return;
connect(runControl, &ProjectExplorer::RunControl::stopped, runControl, [runControl]() {
this->connect(runControl, &ProjectExplorer::RunControl::stopped, runControl, [runControl]() {
ProjectExplorer::ProjectExplorerPlugin::runRunConfiguration(
runControl->runConfiguration(),
ProjectExplorer::Constants::QML_PREVIEW_RUN_MODE, true);
@@ -124,12 +128,33 @@ LocalQmlPreviewSupport::LocalQmlPreviewSupport(ProjectExplorer::RunControl *runC
addStartDependency(preview);
setStarter([this, runControl, serverUrl] {
ProjectExplorer::Runnable run = runControl->runnable();
ProjectExplorer::Runnable runnable = runControl->runnable();
QStringList qmlProjectRunConfigurationArguments = runnable.commandLine().splitArguments();
Utils::QtcProcess::addArg(&run.commandLineArguments,
const auto currentTarget = runControl->target();
const auto *qmlBuildSystem = qobject_cast<QmlProjectManager::QmlBuildSystem *>(currentTarget->buildSystem());
const auto aspect = runControl->aspect<QmlProjectManager::QmlMainFileAspect>();
const QString mainScript = aspect->mainScript();
const QString currentFile = aspect->currentFile();
const QString mainScriptFromProject = qmlBuildSystem->targetFile(
Utils::FilePath::fromString(mainScript)).toString();
const QString currentFileFromProject = qmlBuildSystem->targetFile(
Utils::FilePath::fromString(currentFile)).toString();
if (!currentFile.isEmpty() && qmlProjectRunConfigurationArguments.last().contains(mainScriptFromProject)) {
qmlProjectRunConfigurationArguments.removeLast();
auto commandLine = Utils::CommandLine(runnable.commandLine().executable(), qmlProjectRunConfigurationArguments);
commandLine.addArg(currentFile);
runnable.setCommandLine(commandLine);
}
Utils::QtcProcess::addArg(&runnable.commandLineArguments,
QmlDebug::qmlDebugLocalArguments(QmlDebug::QmlPreviewServices,
serverUrl.path()));
doStart(run, {});
doStart(runnable, {});
});
}