diff options
| author | Eike Ziller <[email protected]> | 2025-04-09 09:46:56 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2025-04-09 09:46:56 +0200 |
| commit | b7aa54efe3ea39509a71b0a84d38f8620b8ec249 (patch) | |
| tree | 538f05c9982519504d00629396a24cf65aae1ac7 /src/plugins/qmlprofiler | |
| parent | d22f2a5eb7e2c01571f2dd82db747b85bb604e94 (diff) | |
| parent | 72a3ff75b3cf5162925b01eb44749b3478a79e57 (diff) | |
Merge remote-tracking branch 'origin/16.0'
Conflicts:
.github/workflows/build_cmake.yml
coin/instructions/common_environment.yaml
src/plugins/lua/bindings/texteditor.cpp
src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp
src/plugins/qmlprofiler/qmlprofilertool.cpp
Change-Id: I5cf84f47c4ce79b6e48d836e8fa083a656b0ce4b
Diffstat (limited to 'src/plugins/qmlprofiler')
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilertool.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp index 7a584361f1e..f4d9ee448b2 100644 --- a/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerruncontrol.cpp @@ -26,7 +26,6 @@ namespace QmlProfiler::Internal { Group qmlProfilerRecipe(RunControl *runControl) { - runControl->requestQmlChannel(); runControl->setIcon(ProjectExplorer::Icons::ANALYZER_START_SMALL_TOOLBAR); const auto onSetup = [runControl](Barrier &barrier) { @@ -77,6 +76,7 @@ RunWorker *createLocalQmlProfilerWorker(RunControl *runControl) worker->setId("LocalQmlProfilerSupport"); auto profiler = new RecipeRunner(runControl, qmlProfilerRecipe(runControl)); + runControl->requestQmlChannel(); worker->addStopDependency(profiler); // We need to open the local server before the application tries to connect. diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index 2566fece1c4..c2bf5a17f9a 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -557,7 +557,8 @@ RunControl *QmlProfilerTool::attachToWaitingApplication() d->m_viewContainer->perspective()->select(); auto runControl = new RunControl(ProjectExplorer::Constants::QML_PROFILER_RUN_MODE); - runControl->copyDataFromRunConfiguration(activeRunConfigForActiveProject()); + if (RunConfiguration *runConfig = activeRunConfigForActiveProject()) + runControl->copyDataFromRunConfiguration(runConfig); runControl->setQmlChannel(serverUrl); // The object as such is needed, the RunWorker becomes part of the RunControl at construction time, // similar to how QObject children are owned by their parents |