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

Merge remote-tracking branch 'origin/9.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/vcsbase/vcscommand.cpp

Change-Id: I2d33113bfb2ea7134550cda1de4e2c21e6711778
This commit is contained in:
Eike Ziller
2022-10-18 16:51:36 +02:00
parent ac3a7991ff 471b036803
commit 3bdb1a3edf
286 changed files with 5071 additions and 4075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmlprofiler/qml/QmlProfilerFlameGraphView.qml
View File

@@ -28,7 +28,6 @@ FlameGraphView {
QmlProfilerFlameGraphModel.CallCountRole, qsTranslate("QmlProfiler", "Calls"),
QmlProfilerFlameGraphModel.DetailsRole, qsTranslate("QmlProfiler", "Details"),
QmlProfilerFlameGraphModel.TimePerCallRole, qsTranslate("QmlProfiler", "Mean Time"),
QmlProfilerFlameGraphModel.TimeInPercentRole, qsTranslate("QmlProfiler", "In Percent"),
QmlProfilerFlameGraphModel.LocationRole, qsTranslate("QmlProfiler", "Location"),
QmlProfilerFlameGraphModel.AllocationsRole, qsTranslate("QmlProfiler", "Allocations"),
QmlProfilerFlameGraphModel.MemoryRole, qsTranslate("QmlProfiler", "Memory")

7
src/plugins/qmlprofiler/qmlprofilertextmark.cpp
View File

@@ -34,13 +34,6 @@ void QmlProfilerTextMark::addTypeId(int typeId)
setLineAnnotation(statisticsView->summary(m_typeIds));
}
void QmlProfilerTextMark::clicked()
{
int typeId = m_typeIds.takeFirst();
m_typeIds.append(typeId);
emit m_viewManager->typeSelected(typeId);
}
QmlProfilerTextMarkModel::QmlProfilerTextMarkModel(QObject *parent) : QObject(parent)
{
}

2
src/plugins/qmlprofiler/qmlprofilertextmark.h
View File

@@ -17,8 +17,6 @@ public:
const Utils::FilePath &fileName, int lineNumber);
void addTypeId(int typeId);
void clicked() override;
bool isClickable() const override { return true; }
bool addToolTipContent(QLayout *target) const override;
private: