diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2019-12-10 16:25:41 +0100 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2020-01-13 15:48:47 +0000 |
| commit | fb171ebc5bc6e9c88764ce9dcacf08628a7523da (patch) | |
| tree | afcad7db577b897d5335b9071ec6c7f3fc96d84f /src/plugins/qmlprojectmanager | |
| parent | 266c808117c3af879dbc8385c41ac19a30149384 (diff) | |
QmlDesigner: use current file to start preview
- Maybe we need a check if it is a qml file.
Task-number: QDS-1299
Change-Id: I2b54514f311fb78d3508e588783c0d04c7a7bc0b
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/qmlprojectmanager')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlmainfileaspect.h | 2 | ||||
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlproject.h | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp index 818f6e9da4..b1bc799437 100644 --- a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp +++ b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp @@ -212,6 +212,11 @@ QString QmlMainFileAspect::mainScript() const return m_currentFileFilename; } +QString QmlMainFileAspect::currentFile() const +{ + return m_currentFileFilename; +} + void QmlMainFileAspect::changeCurrentFile(Core::IEditor *editor) { if (!editor) diff --git a/src/plugins/qmlprojectmanager/qmlmainfileaspect.h b/src/plugins/qmlprojectmanager/qmlmainfileaspect.h index 286d000d3d..61a7b337b7 100644 --- a/src/plugins/qmlprojectmanager/qmlmainfileaspect.h +++ b/src/plugins/qmlprojectmanager/qmlmainfileaspect.h @@ -46,6 +46,7 @@ class QmlBuildSystem; class QMLPROJECTMANAGER_EXPORT QmlMainFileAspect : public ProjectExplorer::ProjectConfigurationAspect { + Q_OBJECT public: explicit QmlMainFileAspect(ProjectExplorer::Target *target); ~QmlMainFileAspect() override; @@ -67,6 +68,7 @@ public: void setScriptSource(MainScriptSource source, const QString &settingsPath = QString()); QString mainScript() const; + QString currentFile() const; void changeCurrentFile(Core::IEditor *editor = nullptr); bool isQmlFilePresent(); QmlBuildSystem *qmlBuildSystem() const; diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h index f12da342fe..b1b4c6bd53 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.h +++ b/src/plugins/qmlprojectmanager/qmlproject.h @@ -40,7 +40,7 @@ namespace QmlProjectManager { class QmlProject; class QmlProjectItem; -class QmlBuildSystem : public ProjectExplorer::BuildSystem +class QMLPROJECTMANAGER_EXPORT QmlBuildSystem : public ProjectExplorer::BuildSystem { Q_OBJECT |