diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2013-06-24 14:05:56 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-24 18:10:01 +0200 |
| commit | aa4ddfd8443f07badc0899d835027e46c6e0dfd8 (patch) | |
| tree | 546d3cff62a4e2ac497c71f48f03a177d72790fe /examples | |
| parent | f90d7eed222d65bd35730c2dd09fc68c3d67eea0 (diff) | |
| download | qtquickcontrols-aa4ddfd8443f07badc0899d835027e46c6e0dfd8.tar.gz | |
Adapt to Qt.platform.os rename ("mac" -> "osx")v5.1.0-rc2v5.1.0
Change-Id: I089a01bee10b92f85dcdd338c695a3b796b0ecd1
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quick/controls/gallery/content/ModelView.qml | 2 | ||||
| -rw-r--r-- | examples/quick/controls/gallery/main.qml | 2 | ||||
| -rw-r--r-- | examples/quick/controls/tableview/main.qml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/quick/controls/gallery/content/ModelView.qml b/examples/quick/controls/gallery/content/ModelView.qml index e6a6040f..483d99ee 100644 --- a/examples/quick/controls/gallery/content/ModelView.qml +++ b/examples/quick/controls/gallery/content/ModelView.qml @@ -51,7 +51,7 @@ Item { width: 600 height: 300 anchors.fill: parent - anchors.margins: Qt.platform.os === "mac" ? 12 : 6 + anchors.margins: Qt.platform.os === "osx" ? 12 : 6 // XmlListModel { // id: flickerModel diff --git a/examples/quick/controls/gallery/main.qml b/examples/quick/controls/gallery/main.qml index 8ea3cf9e..ec00627b 100644 --- a/examples/quick/controls/gallery/main.qml +++ b/examples/quick/controls/gallery/main.qml @@ -228,7 +228,7 @@ ApplicationWindow { enabled: enabledCheck.checked tabPosition: controlPage.item ? controlPage.item.tabPosition : Qt.TopEdge anchors.fill: parent - anchors.margins: Qt.platform.os === "mac" ? 12 : 2 + anchors.margins: Qt.platform.os === "osx" ? 12 : 2 Tab { id: controlPage diff --git a/examples/quick/controls/tableview/main.qml b/examples/quick/controls/tableview/main.qml index 3ecf5ddb..1a9246f8 100644 --- a/examples/quick/controls/tableview/main.qml +++ b/examples/quick/controls/tableview/main.qml @@ -129,7 +129,7 @@ Window { focus:true enabled: enabledCheck.checked - property int margins: Qt.platform.os === "mac" ? 16 : 0 + property int margins: Qt.platform.os === "osx" ? 16 : 0 height: parent.height - 34 anchors.right: parent.right |