From 099df32ce03c8820ec29ef63fa825c7159887b08 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Date: Thu, 21 Mar 2013 14:29:07 +0100
Subject: [PATCH] Get rid of private imports from gallery
Change-Id: Icf8e689fc35ee3a73ae91989eb65a3ae6172db53
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
---
examples/gallery/content/ModelView.qml | 2 +-
examples/gallery/main.qml | 4 +---
examples/tableview/main.qml | 4 ++--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/examples/gallery/content/ModelView.qml b/examples/gallery/content/ModelView.qml
index 81bd9f7b9..237604e5d 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 ee25dc91e..04e1ddf54 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 bf7586f0f..8b5de6eff 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
--
GitLab