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

PerfProfiler: Allow creating trace points without valid project

Browse Source 
We can still create trace points on the desktop device then.

Change-Id: I123bece2d11a6405883e0bcec9b066cec4e017b9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Ulf Hermann
2019-01-28 10:05:38 +01:00
parent 8bc7e04012
commit e25be3d5ee
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/perfprofiler/perftracepointdialog.cpp
View File

@@ -26,6 +26,7 @@
#include "perftracepointdialog.h" #include "perftracepointdialog.h"
#include "ui_perftracepointdialog.h" #include "ui_perftracepointdialog.h"
#include <projectexplorer/devicesupport/devicemanager.h>
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
@@ -46,17 +47,26 @@ PerfTracePointDialog::PerfTracePointDialog() :
{ {
m_ui->setupUi(this); m_ui->setupUi(this);
Project *currentProject = SessionManager::startupProject(); if (Project *currentProject = SessionManager::startupProject()) {
QTC_ASSERT(currentProject, return); if (const Target *target = currentProject->activeTarget()) {
const Kit *kit = target->kit();
QTC_ASSERT(kit, return);
const Target *target = currentProject->activeTarget(); m_device = DeviceKitInformation::device(kit);
QTC_ASSERT(target, return); if (!m_device) {
m_ui->textEdit->setPlainText(tr("Error: No device available for active target."));
return;
}
}
}
const Kit *kit = target->kit(); if (!m_device) {
QTC_ASSERT(kit, return); const DeviceManager *deviceManager = DeviceManager::instance();
m_device = DeviceKitInformation::device(kit); // There should at least be a desktop device.
QTC_ASSERT(m_device, return); m_device = deviceManager->defaultDevice(Constants::DESKTOP_DEVICE_TYPE);
QTC_ASSERT(m_device, return);
}
QFile file(":/perfprofiler/tracepoints.sh"); QFile file(":/perfprofiler/tracepoints.sh");
if (file.open(QIODevice::ReadOnly)) { if (file.open(QIODevice::ReadOnly)) {