From c6fd012fa0d9b70d77cd4d4f76ffe03cba9a8980 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 7 Oct 2021 12:29:42 +0200 Subject: [PATCH] Qt 6.2 workaround added - once https://github.com/uwerat/qskinny/issues/131 is in place we hopefully can remove it again --- examples/buttons/buttons.qml | 3 ++- examples/colorswitch/colorswitch.qml | 9 ++++++--- examples/frames/frames.qml | 3 ++- examples/glabels/glabels.qml | 3 ++- examples/layouts/layouts.qml | 4 +++- examples/messageboxQml/messagebox.qml | 3 ++- 6 files changed, 17 insertions(+), 8 deletions(-) diff --git a/examples/buttons/buttons.qml b/examples/buttons/buttons.qml index 307a75bd..d4ee6d5f 100644 --- a/examples/buttons/buttons.qml +++ b/examples/buttons/buttons.qml @@ -23,7 +23,8 @@ Qsk.Window orientation: Qt.Horizontal dimension: 3 - margins: 10 + //margins: 10 // only possible with Qt >= 6.2 + margins { left: 10; top: 10; right: 10; bottom: 10 } spacing: 10 TestButton diff --git a/examples/colorswitch/colorswitch.qml b/examples/colorswitch/colorswitch.qml index ec53d9a8..32732703 100644 --- a/examples/colorswitch/colorswitch.qml +++ b/examples/colorswitch/colorswitch.qml @@ -38,7 +38,8 @@ Main orientation: Qt.Horizontal spacing: 20 - margins: 8 // so that we can see the focus frame + //margins: 8 // so that we can see the focus frame + margins { left: 8; top: 8; right: 8; bottom: 8 } SimpleListBox { @@ -53,7 +54,8 @@ Main LinearBox { - margins: 10 + // margins: 10 + margins { left: 10; top: 10; right: 10; bottom: 10 } orientation: Qt.Vertical defaultAlignment: Qt.AlignCenter extraSpacingAt: Qt.BottomEdge @@ -86,7 +88,8 @@ Main dimension: 3 spacing: 20 - margins: 20 + //margins: 20 + margins { left: 20; top: 20; right: 20; bottom: 20 } sizePolicy { diff --git a/examples/frames/frames.qml b/examples/frames/frames.qml index c7f908dc..8cc096ab 100644 --- a/examples/frames/frames.qml +++ b/examples/frames/frames.qml @@ -15,7 +15,8 @@ Qsk.Window orientation: Qt.Horizontal dimension: 6 - margins: 10 + //margins: 10 // only possible with Qt >= 6.2 + margins { left: 10; top: 10; right: 10; bottom: 10 } spacing: 10 // panel diff --git a/examples/glabels/glabels.qml b/examples/glabels/glabels.qml index 652b79ad..dacda2bc 100644 --- a/examples/glabels/glabels.qml +++ b/examples/glabels/glabels.qml @@ -15,7 +15,8 @@ Qsk.Window orientation: Qt.Horizontal dimension: 3 - margins: 10 + //margins: 10 + margins { left: 10; top: 10; right: 10; bottom: 10 } spacing: 20 Repeater diff --git a/examples/layouts/layouts.qml b/examples/layouts/layouts.qml index 1e082e45..07278e76 100644 --- a/examples/layouts/layouts.qml +++ b/examples/layouts/layouts.qml @@ -4,7 +4,9 @@ import Test 1.0 GridBox { - margins: 10 + //margins: 10 // only possible with Qt >= 6.2 + margins { left: 10; top: 10; right: 10; bottom: 10 } + autoFillBackground : true background diff --git a/examples/messageboxQml/messagebox.qml b/examples/messageboxQml/messagebox.qml index 5d83e4df..5aa0cc45 100644 --- a/examples/messageboxQml/messagebox.qml +++ b/examples/messageboxQml/messagebox.qml @@ -16,7 +16,8 @@ Qsk.Window orientation: Qt.Horizontal dimension: 2 - margins: 10 + margins { left: 10; top: 10; right: 10; bottom: 10 } + //margins: 10 Qsk.PushButton {