3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-06-10 14:51:54 +02:00
Code Issues Projects Releases Packages Wiki Activity

[qt6] Remove properties that do not exist anymore in Qt6.6

Browse source
This commit is contained in:
Candice Bentéjac 2024-10-01 12:23:26 +02:00
parent 96a70c04ff
commit 02be73df65
7 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
meshroom/ui/qml/GraphEditor/AttributeItemDelegate.qml
View file

@ -444,7 +444,7 @@ RowLayout {
ColorDialog { ColorDialog {
id: colorDialog id: colorDialog
title: "Please choose a color" title: "Please choose a color"
color: attribute.value selectedColor: attribute.value
onAccepted: { onAccepted: {
colorText.text = color colorText.text = color
// Artificially trigger change of attribute value // Artificially trigger change of attribute value

4
meshroom/ui/qml/GraphEditor/NodeLog.qml
View file

@ -29,7 +29,7 @@ FocusScope {
anchors.fill: parent anchors.fill: parent
property string currentFile: (root.currentChunkIndex >= 0 && root.currentChunk) ? root.currentChunk["logFile"] : "" property string currentFile: (root.currentChunkIndex >= 0 && root.currentChunk) ? root.currentChunk["logFile"] : ""
property url source: Filepath.stringToUrl(currentFile) property url sourceFile: Filepath.stringToUrl(currentFile)
sourceComponent: textFileViewerComponent sourceComponent: textFileViewerComponent
} }
@ -40,7 +40,7 @@ FocusScope {
TextFileViewer { TextFileViewer {
id: textFileViewer id: textFileViewer
anchors.fill: parent anchors.fill: parent
source: componentLoader.source source: componentLoader.sourceFile
autoReload: root.currentChunk !== undefined && root.currentChunk.statusName === "RUNNING" autoReload: root.currentChunk !== undefined && root.currentChunk.statusName === "RUNNING"
// source is set in fileSelector // source is set in fileSelector
} }

4
meshroom/ui/qml/GraphEditor/NodeStatistics.qml
View file

@ -27,7 +27,7 @@ FocusScope {
clip: true clip: true
anchors.fill: parent anchors.fill: parent
property string currentFile: currentChunk ? currentChunk["statisticsFile"] : "" property string currentFile: currentChunk ? currentChunk["statisticsFile"] : ""
property url source: Filepath.stringToUrl(currentFile) property url sourceFile: Filepath.stringToUrl(currentFile)
sourceComponent: chunksLV.chunksSummary ? statViewerComponent : chunkStatViewerComponent sourceComponent: chunksLV.chunksSummary ? statViewerComponent : chunkStatViewerComponent
} }
@ -37,7 +37,7 @@ FocusScope {
StatViewer { StatViewer {
id: statViewer id: statViewer
anchors.fill: parent anchors.fill: parent
source: componentLoader.source source: componentLoader.sourceFile
} }
} }

4
meshroom/ui/qml/GraphEditor/NodeStatus.qml
View file

@ -26,7 +26,7 @@ FocusScope {
anchors.fill: parent anchors.fill: parent
property string currentFile: (root.currentChunkIndex >= 0) ? root.currentChunk["statusFile"] : "" property string currentFile: (root.currentChunkIndex >= 0) ? root.currentChunk["statusFile"] : ""
property url source: Filepath.stringToUrl(currentFile) property url sourceFile: Filepath.stringToUrl(currentFile)
sourceComponent: statViewerComponent sourceComponent: statViewerComponent
} }
@ -35,7 +35,7 @@ FocusScope {
id: statViewerComponent id: statViewerComponent
Item { Item {
id: statusViewer id: statusViewer
property url source: componentLoader.source property url source: componentLoader.sourceFile
property var lastModified: undefined property var lastModified: undefined
onSourceChanged: { onSourceChanged: {

1
meshroom/ui/qml/Viewer3D/BoundingBox.qml
View file

@ -56,7 +56,6 @@ Entity {
count: 24 count: 24
name: defaultPositionAttributeName name: defaultPositionAttributeName
buffer: Buffer { buffer: Buffer {
type: Buffer.VertexBuffer
data: new Float32Array([ data: new Float32Array([
1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
1.0, -1.0, 1.0, 1.0, -1.0, 1.0,

1
meshroom/ui/qml/Viewer3D/Grid3D.qml
View file

@ -18,7 +18,6 @@ Entity {
count: 0 count: 0
name: defaultPositionAttributeName name: defaultPositionAttributeName
buffer: Buffer { buffer: Buffer {
type: Buffer.VertexBuffer
data: { data: {
function buildGrid(first, last, offset, attribute) { function buildGrid(first, last, offset, attribute) {
var vertexCount = (((last-first)/offset)+1)*4; var vertexCount = (((last-first)/offset)+1)*4;

2
meshroom/ui/qml/Viewer3D/Locator3D.qml
View file

@ -19,7 +19,6 @@ Entity {
count: 6 count: 6
name: defaultPositionAttributeName name: defaultPositionAttributeName
buffer: Buffer { buffer: Buffer {
type: Buffer.VertexBuffer
data: new Float32Array([ data: new Float32Array([
0.0, 0.001, 0.0, 0.0, 0.001, 0.0,
1.0, 0.001, 0.0, 1.0, 0.001, 0.0,
@ -37,7 +36,6 @@ Entity {
count: 6 count: 6
name: defaultColorAttributeName name: defaultColorAttributeName
buffer: Buffer { buffer: Buffer {
type: Buffer.VertexBuffer
data: new Float32Array([ data: new Float32Array([
Colors.red.r, Colors.red.g, Colors.red.b, Colors.red.r, Colors.red.g, Colors.red.b,
Colors.red.r, Colors.red.g, Colors.red.b, Colors.red.r, Colors.red.g, Colors.red.b,