diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2024-04-23 14:36:48 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2024-04-23 16:05:55 +0200 |
| commit | ef0ee52bf92739bc5b32d70c01ff1eadd752d813 (patch) | |
| tree | 0f3b2f546af088b86f21452622d77be43386cd5f /src/plugins/qmlpreview | |
| parent | d9c8590c5fd10b1feceb389c142ec244909739a2 (diff) | |
| parent | 7dfa7469207f899e347dc6f2bf0c3011140a9b23 (diff) | |
Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
src/plugins/remotelinux/linuxdevicetester.cpp
Change-Id: I3683c1799df05209d05413383456b285a2daf96e
Diffstat (limited to 'src/plugins/qmlpreview')
| -rw-r--r-- | src/plugins/qmlpreview/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/qmlpreview/qmlpreviewplugin.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/qmlpreview/CMakeLists.txt b/src/plugins/qmlpreview/CMakeLists.txt index 4c1889143aa..440b407b70a 100644 --- a/src/plugins/qmlpreview/CMakeLists.txt +++ b/src/plugins/qmlpreview/CMakeLists.txt @@ -4,7 +4,7 @@ add_qtc_plugin(QmlPreview DEPENDS QmlJS Qt::QmlPrivate PLUGIN_DEPENDS Core ProjectExplorer QmlJSTools QtSupport - ResourceEditor QmlProjectManager + ResourceEditor QmlProjectManager TextEditor SOURCES qmlpreviewclient.cpp qmlpreviewclient.h qmlpreviewconnectionmanager.cpp qmlpreviewconnectionmanager.h diff --git a/src/plugins/qmlpreview/qmlpreviewplugin.cpp b/src/plugins/qmlpreview/qmlpreviewplugin.cpp index 31638f76622..70f905448e1 100644 --- a/src/plugins/qmlpreview/qmlpreviewplugin.cpp +++ b/src/plugins/qmlpreview/qmlpreviewplugin.cpp @@ -166,12 +166,8 @@ QmlPreviewPluginPrivate::QmlPreviewPluginPrivate(QmlPreviewPlugin *parent) runPreviewAction->setEnabled(ProjectManager::startupProject() != nullptr); connect(ProjectManager::instance(), &ProjectManager::startupProjectChanged, runPreviewAction, &QAction::setEnabled); - connect(runPreviewAction, &QAction::triggered, this, [runPreviewAction, this] { + connect(runPreviewAction, &QAction::triggered, this, [&, runPreviewAction] { runPreviewAction->setEnabled(false); - attachToEditorManager(); - setDirty(); - onEditorChanged(Core::EditorManager::currentEditor()); - if (auto multiLanguageAspect = QmlProjectManager::QmlMultiLanguageAspect::current()) m_localeIsoCode = multiLanguageAspect->currentLocale(); bool skipDeploy = false; @@ -425,7 +421,7 @@ void QmlPreviewPluginPrivate::onEditorAboutToClose(Core::IEditor *editor) void QmlPreviewPluginPrivate::setDirty() { m_dirty = true; - QTimer::singleShot(1000, this, [this](){ + QTimer::singleShot(1000, this, [&](){ if (m_dirty && m_lastEditor) { m_dirty = false; checkEditor(); @@ -435,6 +431,10 @@ void QmlPreviewPluginPrivate::setDirty() void QmlPreviewPlugin::addPreview(RunControl *preview) { + d->attachToEditorManager(); + d->setDirty(); + d->onEditorChanged(Core::EditorManager::currentEditor()); + d->m_runningPreviews.append(preview); emit runningPreviewsChanged(d->m_runningPreviews); } |