7 files changed, 13 insertions, 9 deletions
diff --git a/tests/baseline/controls/data/dialog/dialog.qml b/tests/baseline/controls/data/dialog/dialog.qml
index fc3f3f26f3..cf41707da0 100644
--- a/tests/baseline/controls/data/dialog/dialog.qml
+++ b/tests/baseline/controls/data/dialog/dialog.qml
@@ -12,9 +12,7 @@ Item {
         width: 50
         visible: true
         enabled: true
-        header: Text {
-            text: qsTr("dialog 1")
-        }
+        title: qsTr("dialog 1")
     }
 
     Dialog {
diff --git a/tests/baseline/controls/data/dialog/modal.qml b/tests/baseline/controls/data/dialog/modal.qml
index a602d6d037..c59b9b8545 100644
--- a/tests/baseline/controls/data/dialog/modal.qml
+++ b/tests/baseline/controls/data/dialog/modal.qml
@@ -12,8 +12,6 @@ Item {
         visible: true
         enabled: true
         modal: true
-        header: Text {
-            text: qsTr("dialog 1")
-        }
+        title: qsTr("dialog 1")
     }
 }
diff --git a/tests/baseline/controls/data/groupBox/groupbox.qml b/tests/baseline/controls/data/groupBox/groupbox.qml
index b7930a1b35..25834b93f1 100644
--- a/tests/baseline/controls/data/groupBox/groupbox.qml
+++ b/tests/baseline/controls/data/groupBox/groupbox.qml
@@ -13,7 +13,7 @@ ColumnLayout {
 
     GroupBox {
         title: "Title 2"
-        label: Text {
+        label: Label {
             text: "I am Text label in GroupBox"
         }
     }
diff --git a/tests/baseline/controls/data/popup/modal.qml b/tests/baseline/controls/data/popup/modal.qml
index 609fa19956..dfcab2e3f2 100644
--- a/tests/baseline/controls/data/popup/modal.qml
+++ b/tests/baseline/controls/data/popup/modal.qml
@@ -9,7 +9,7 @@ Item {
         anchors.centerIn: parent
         modal: true
         visible: true
-        Text {
+        Label {
             text: "visible"
         }
     }
diff --git a/tests/baseline/controls/data/popup/popup.qml b/tests/baseline/controls/data/popup/popup.qml
index 50d41b351d..350d34fb1c 100644
--- a/tests/baseline/controls/data/popup/popup.qml
+++ b/tests/baseline/controls/data/popup/popup.qml
@@ -8,7 +8,7 @@ Item {
     Popup {
         anchors.centerIn: parent
         visible: true
-        Text {
+        Label {
             text: "visible"
         }
     }
diff --git a/tests/baseline/controls/data/textarea/textarea.qml b/tests/baseline/controls/data/textarea/textarea.qml
index e34709c6cf..57b57606b4 100644
--- a/tests/baseline/controls/data/textarea/textarea.qml
+++ b/tests/baseline/controls/data/textarea/textarea.qml
@@ -8,11 +8,13 @@ ColumnLayout {
 
     TextArea {
         text: "TextArea\n...\n...\n...\n..."
+        cursorVisible: false
     }
 
     TextArea {
         placeholderText: "TextArea\n...\n...\n..."
         enabled: false
+        cursorVisible: false
     }
 
     TextArea {
@@ -24,6 +26,7 @@ ColumnLayout {
     TextArea {
         text: "TextArea\n...\n...\n...\n..."
         LayoutMirroring.enabled: true
+        cursorVisible: false
     }
 }
 
diff --git a/tests/baseline/controls/data/textfield/textfield.qml b/tests/baseline/controls/data/textfield/textfield.qml
index bc0b1f215f..00b00913f8 100644
--- a/tests/baseline/controls/data/textfield/textfield.qml
+++ b/tests/baseline/controls/data/textfield/textfield.qml
@@ -9,21 +9,25 @@ ColumnLayout {
     TextField {
         placeholderText: qsTr("Enter text")
         enabled: false
+        cursorVisible: false
     }
 
     TextField {
         placeholderText: qsTr("Enter text")
         placeholderTextColor: "red"
+        cursorVisible: false
     }
 
     TextField {
         placeholderText: qsTr("Enter text")
         focus: true
+        cursorVisible: false
     }
 
     TextField {
         placeholderText: qsTr("Enter text")
         LayoutMirroring.enabled: true
+        cursorVisible: false
     }
 
     TextField {
@@ -31,5 +35,6 @@ ColumnLayout {
                    + "sed do eiusmod tempor incididunt utlabore et dolore magna"
                    + "aliqua.Ut enim ad minim veniam, quis nostrud exercitation"
                    + "ullamco laboris nisi ut aliquip ex ea commodo consequat.")
+        cursorVisible: false
     }
 }