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

Tracing/Qml|PerfProfiler/CtfVisualizer: Move QML modules to :/qt/qml

Browse Source 
We don't want to dedicate the whole resource file system to QML.

Change-Id: I4c7e4af7aeeab00f44c5244e99949a90abb032cf
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Alessandro Portale
2022-07-19 17:26:34 +02:00
committed by Ulf Hermann
parent 24c6073196
commit 8cb1775ba8
23 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmlprofiler/CMakeLists.txt
View File

@@ -97,7 +97,7 @@ endforeach()
qt_add_shaders(QmlProfiler "res_qmlprofilershaders"
BATCHABLE
PREFIX
"/QtCreator/QmlProfiler"
"/qt/qml/QtCreator/QmlProfiler"
BASE
"qml"
FILES
@@ -109,6 +109,7 @@ qt_add_qml_module(QmlProfiler
URI "QtCreator.QmlProfiler"
VERSION "1.0"
NO_PLUGIN
RESOURCE_PREFIX "/qt/qml"
QML_FILES
${QMLPROFILER_QML_FILES}
RESOURCES

5
src/plugins/qmlprofiler/flamegraphview.cpp
View File

@@ -46,11 +46,12 @@ FlameGraphView::FlameGraphView(QmlProfilerModelManager *manager, QWidget *parent
setObjectName("QmlProfiler.FlameGraph.Dock");
setWindowTitle(tr("Flame Graph"));
m_content->engine()->addImportPath(":/qt/qml/");
Timeline::TimelineTheme::setupTheme(m_content->engine());
m_content->rootContext()->setContextProperty(QStringLiteral("flameGraphModel"), m_model);
m_content->setSource(
QUrl(QStringLiteral("qrc:/QtCreator/QmlProfiler/QmlProfilerFlameGraphView.qml")));
m_content->setSource(QUrl(QStringLiteral(
"qrc:/qt/qml/QtCreator/QmlProfiler/QmlProfilerFlameGraphView.qml")));
m_content->setClearColor(Utils::creatorTheme()->color(Utils::Theme::Timeline_BackgroundColor1));
m_content->setResizeMode(QQuickWidget::SizeRootObjectToView);

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

@@ -24,7 +24,7 @@
****************************************************************************/
import QtCreator.QmlProfiler
import "../Tracing" // TODO: Turn into module import when possible
import QtCreator.Tracing
FlameGraphView {
id: root

2
src/plugins/qmlprofiler/qmlprofiler.qbs
View File

@@ -66,7 +66,7 @@ QtcPlugin {
Group {
name: "Qml Files"
Qt.core.resourcePrefix: "QtCreator/QmlProfiler/"
Qt.core.resourcePrefix: "qt/qml/QtCreator/QmlProfiler/"
fileTags: "qt.core.resource_data"
files: "qml/**"
}

4
src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
View File

@@ -301,8 +301,8 @@ public:
BindingLoopMaterialShader::BindingLoopMaterialShader()
: QSGMaterialShader()
{
setShaderFileName(VertexStage, ":/QtCreator/QmlProfiler/bindingloops_qt6.vert.qsb");
setShaderFileName(FragmentStage, ":/QtCreator/QmlProfiler/bindingloops_qt6.frag.qsb");
setShaderFileName(VertexStage, ":/qt/qml/QtCreator/QmlProfiler/bindingloops_qt6.vert.qsb");
setShaderFileName(FragmentStage, ":/qt/qml/QtCreator/QmlProfiler/bindingloops_qt6.frag.qsb");
}
static QColor bindingLoopsColor()

4
src/plugins/qmlprofiler/qmlprofilertraceview.cpp
View File

@@ -65,6 +65,7 @@
#include <QScrollBar>
#include <QSlider>
#include <QMenu>
#include <QQmlEngine>
#include <QQuickItem>
#include <QQuickWidget>
#include <QApplication>
@@ -159,13 +160,14 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerViewManag
// Minimum height: 5 rows of 20 pixels + scrollbar of 50 pixels + 20 pixels margin
setMinimumHeight(170);
d->m_mainView->engine()->addImportPath(":/qt/qml/");
Timeline::TimelineTheme::setupTheme(d->m_mainView->engine());
d->m_mainView->rootContext()->setContextProperty(QLatin1String("timelineModelAggregator"),
d->m_modelProxy);
d->m_mainView->rootContext()->setContextProperty(QLatin1String("zoomControl"),
d->m_zoomControl);
d->m_mainView->setSource(QUrl(QLatin1String("qrc:/QtCreator/Tracing/MainView.qml")));
d->m_mainView->setSource(QUrl(QLatin1String("qrc:/qt/qml/QtCreator/Tracing/MainView.qml")));
connect(d->m_modelProxy, &Timeline::TimelineModelAggregator::updateCursorPosition,
this, &QmlProfilerTraceView::updateCursorPosition);