Resolved merge conflict

This commit is contained in:
2024-11-15 15:18:31 +01:00
5 changed files with 20 additions and 100 deletions

View File

@@ -22,6 +22,7 @@ Item {
//icon.source: "../images/addbusiness.svg"
icon.source: "qrc:/images/addbusiness.svg"
icon.color: "olive"
//width: icon.width
anchors.right: parent.right
flat: true
onClicked: appLoader.source = "AddCustomer.qml"
@@ -132,18 +133,18 @@ Item {
// return newWidth
// }
Timer
{
running: true
interval: 3000
repeat: true
onTriggered:
{
//testTable.columnWidths[2] = 150
console.log("Timing..")
testTable.forceLayout();
}
}
// Timer
// {
// running: true
// interval: 3000
// repeat: true
// onTriggered:
// {
// //testTable.columnWidths[2] = 150
// console.log("Timing..")
// testTable.forceLayout();
// }
// }