diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-25 23:27:43 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-25 23:27:43 +0200 |
| commit | 8bfa53532654d441ff8e2e97fcd36b7f4b7a1f92 (patch) | |
| tree | 2eccdd5691bf3f6909668cf12f48621b1f46f160 /examples/quick | |
| parent | 7641916c69a9a46218befa353d97b23099066add (diff) | |
| parent | aa4ddfd8443f07badc0899d835027e46c6e0dfd8 (diff) | |
| download | qtquickcontrols-8bfa53532654d441ff8e2e97fcd36b7f4b7a1f92.tar.gz | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I1684510ce4f1b52e3569d8c04e272b1c8fd63c1a
Diffstat (limited to 'examples/quick')
| -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 |