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 /src/controls | |
| 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 'src/controls')
| -rw-r--r-- | src/controls/SplitView.qml | 2 | ||||
| -rw-r--r-- | src/controls/TableView.qml | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/controls/SplitView.qml b/src/controls/SplitView.qml index ce60286e..a0558aa8 100644 --- a/src/controls/SplitView.qml +++ b/src/controls/SplitView.qml @@ -76,8 +76,6 @@ import QtQuick.Controls.Private 1.0 as Private \list \li \l{Layout::minimumWidth}{Layout.minimumWidth} \li \l{Layout::minimumHeight}{Layout.minimumHeight} - \li \l{Layout::preferredWidth}{Layout.preferredWidth} - \li \l{Layout::preferredHeight}{Layout.preferredHeight} \li \l{Layout::maximumWidth}{Layout.maximumWidth} \li \l{Layout::maximumHeight}{Layout.maximumHeight} \li \l{Layout::fillWidth}{Layout.fillWidth} (\c true for only one child) diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml index a1429cba..9eca720a 100644 --- a/src/controls/TableView.qml +++ b/src/controls/TableView.qml @@ -399,7 +399,7 @@ ScrollView { implicitHeight: 150 frameVisible: true - __scrollBarTopMargin: Qt.platform.os === "mac" ? headerrow.height : 0 + __scrollBarTopMargin: Qt.platform.os === "osx" ? headerrow.height : 0 __viewTopMargin: headerrow.height /*! \internal */ |