diff --git a/examples/gallery/content/ModelView.qml b/examples/gallery/content/ModelView.qml index 81bd9f7b94bdfbffceaf405ee641454b037790c1..237604e5d6f05f8d3154c961ae5e0769fe802622 100644 --- a/examples/gallery/content/ModelView.qml +++ b/examples/gallery/content/ModelView.qml @@ -51,7 +51,7 @@ Item { width: 600 height: 300 anchors.fill: parent - anchors.margins: styleitem.style == "mac" ? 12 : 0 + anchors.margins: Qt.platform.os === "mac" ? 12 : 0 // XmlListModel { // id: flickerModel diff --git a/examples/gallery/main.qml b/examples/gallery/main.qml index ee25dc91e131c58e79d14ea62720a681fafc5e9d..04e1ddf544f703cc197158c8e390d909921e13e7 100644 --- a/examples/gallery/main.qml +++ b/examples/gallery/main.qml @@ -45,7 +45,6 @@ import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Layouts 1.0 -import QtQuick.Controls.Private 1.0 import "content" ApplicationWindow { @@ -251,7 +250,6 @@ ApplicationWindow { SystemPalette {id: syspal} - StyleItem{ id: styleitem} color: syspal.window ListModel { id: choices @@ -269,7 +267,7 @@ ApplicationWindow { anchors.bottom: parent.bottom anchors.right: parent.right anchors.left: parent.left - anchors.margins: styleitem.style == "mac" ? 12 : 0 + anchors.margins: Qt.platform.os === "mac" ? 12 : 2 Tab { id: controlPage diff --git a/examples/tableview/main.qml b/examples/tableview/main.qml index bf7586f0f70abe0b800712c0675f5532420e200d..8b5de6eff73bad713737e0d26a0d7eaf0d9fb75c 100644 --- a/examples/tableview/main.qml +++ b/examples/tableview/main.qml @@ -44,7 +44,6 @@ import QtQuick 2.1 import QtQuick.Controls 1.0 -import QtQuick.Controls.Private 1.0 import QtQuick.XmlListModel 2.0 Rectangle { @@ -122,7 +121,8 @@ Rectangle { focus:true enabled: enabledCheck.checked - property int margins : styleitem.style == "mac" ? 16 : 0 + property int margins: Qt.platform.os === "mac" ? 16 : 0 + height: parent.height - 34 anchors.right: parent.right anchors.left: parent.left