summaryrefslogtreecommitdiff
path: root/src/controls/Private
diff options
context:
space:
mode:
Diffstat (limited to 'src/controls/Private')
-rw-r--r--src/controls/Private/BasicTableView.qml4
-rw-r--r--src/controls/Private/ColumnMenuContent.qml4
-rw-r--r--src/controls/Private/MenuContentItem.qml7
-rw-r--r--src/controls/Private/ScrollViewHelper.qml13
-rw-r--r--src/controls/Private/TabBar.qml4
-rw-r--r--src/controls/Private/ToolMenuButton.qml7
6 files changed, 28 insertions, 11 deletions
diff --git a/src/controls/Private/BasicTableView.qml b/src/controls/Private/BasicTableView.qml
index 6c7c5511..48e6eadc 100644
--- a/src/controls/Private/BasicTableView.qml
+++ b/src/controls/Private/BasicTableView.qml
@@ -48,6 +48,7 @@
// We mean it.
//
+import QtQml 2.14 as Qml
import QtQuick 2.6
import QtQuick.Controls 1.5
import QtQuick.Controls.Private 1.0
@@ -426,7 +427,7 @@ ScrollView {
&& !transientScrollBars && Qt.platform.os === "osx" ?
__verticalScrollBar.width + __scroller.scrollBarSpacing + root.__style.padding.right : 0
- Binding {
+ Qml.Binding {
// On Mac, we reserve the vSB space in the contentItem because the vSB should
// appear under the header. Unfortunately, the ListView header won't expand
// beyond the ListView's boundaries, that's why we need to ressort to this.
@@ -434,6 +435,7 @@ ScrollView {
when: Qt.platform.os === "osx"
property: "verticalScrollbarOffset"
value: 0
+ restoreMode: Binding.RestoreBinding
}
function incrementCurrentIndexBlocking() {
diff --git a/src/controls/Private/ColumnMenuContent.qml b/src/controls/Private/ColumnMenuContent.qml
index e130b2a2..5f8b4d68 100644
--- a/src/controls/Private/ColumnMenuContent.qml
+++ b/src/controls/Private/ColumnMenuContent.qml
@@ -37,6 +37,7 @@
**
****************************************************************************/
+import QtQml 2.14 as Qml
import QtQuick 2.2
import QtQuick.Controls 1.2
import QtQuick.Controls.Private 1.0
@@ -242,9 +243,10 @@ Item {
? ListView.Center : ListView.Beginning)
}
- Binding {
+ Qml.Binding {
target: scrollView.__verticalScrollBar
property: "singleStep"
value: itemHeight
+ restoreMode: Binding.RestoreBinding
}
}
diff --git a/src/controls/Private/MenuContentItem.qml b/src/controls/Private/MenuContentItem.qml
index fe8e7726..9fcb2f0f 100644
--- a/src/controls/Private/MenuContentItem.qml
+++ b/src/controls/Private/MenuContentItem.qml
@@ -37,6 +37,7 @@
**
****************************************************************************/
+import QtQml 2.14 as Qml
import QtQuick 2.2
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.1
@@ -155,11 +156,12 @@ Loader {
Keys.onReturnPressed: d.triggerCurrent()
Keys.onEnterPressed: d.triggerCurrent()
- Binding {
+ Qml.Binding {
// Make sure the styled frame is in the background
target: item
property: "z"
value: content.z - 1
+ restoreMode: Binding.RestoreBinding
}
ColumnMenuContent {
@@ -268,11 +270,12 @@ Loader {
d.mnemonicsMap[title[ampersandPos + 1].toUpperCase()] = menuItemLoader
}
- Binding {
+ Qml.Binding {
target: menuItemLoader.item
property: "width"
property alias menuItem: menuItemLoader.item
value: menuItem ? Math.max(__menu.__minimumWidth, content.width) - 2 * menuItem.x : 0
+ restoreMode: Binding.RestoreBinding
}
}
}
diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml
index 3f309bb0..c16c55b8 100644
--- a/src/controls/Private/ScrollViewHelper.qml
+++ b/src/controls/Private/ScrollViewHelper.qml
@@ -37,6 +37,7 @@
**
****************************************************************************/
+import QtQml 2.14 as Qml
import QtQuick 2.2
import QtQuick.Controls 1.2
import QtQuick.Controls.Private 1.0
@@ -147,17 +148,19 @@ Item {
flickableItem.contentX = value + flickableItem.originX
}
}
- Binding {
+ Qml.Binding {
target: hscrollbar.__panel
property: "raised"
value: vscrollbar.active || scrollHelper.active
when: hscrollbar.isTransient
+ restoreMode: Binding.RestoreBinding
}
- Binding {
+ Qml.Binding {
target: hscrollbar.__panel
property: "visible"
value: true
when: !hscrollbar.isTransient || scrollHelper.active
+ restoreMode: Binding.RestoreBinding
}
function flash() {
if (hscrollbar.isTransient) {
@@ -201,17 +204,19 @@ Item {
flickableItem.contentY = value + flickableItem.originY
}
}
- Binding {
+ Qml.Binding {
target: vscrollbar.__panel
property: "raised"
value: hscrollbar.active || scrollHelper.active
when: vscrollbar.isTransient
+ restoreMode: Binding.RestoreBinding
}
- Binding {
+ Qml.Binding {
target: vscrollbar.__panel
property: "visible"
value: true
when: !vscrollbar.isTransient || scrollHelper.active
+ restoreMode: Binding.RestoreBinding
}
function flash() {
if (vscrollbar.isTransient) {
diff --git a/src/controls/Private/TabBar.qml b/src/controls/Private/TabBar.qml
index bf76b977..1186968d 100644
--- a/src/controls/Private/TabBar.qml
+++ b/src/controls/Private/TabBar.qml
@@ -37,6 +37,7 @@
**
****************************************************************************/
+import QtQml 2.14 as Qml
import QtQuick 2.2
import QtQuick.Controls 1.2
import QtQuick.Controls.Private 1.0
@@ -170,11 +171,12 @@ FocusScope {
focus: true
enabled: modelData.enabled
- Binding {
+ Qml.Binding {
target: tabbar
when: selected
property: "__selectedTabRect"
value: Qt.rect(x, y, width, height)
+ restoreMode: Binding.RestoreBinding
}
drag.target: tabsMovable ? tabloader : null
diff --git a/src/controls/Private/ToolMenuButton.qml b/src/controls/Private/ToolMenuButton.qml
index 2366d0c9..e6fba40c 100644
--- a/src/controls/Private/ToolMenuButton.qml
+++ b/src/controls/Private/ToolMenuButton.qml
@@ -37,6 +37,7 @@
**
****************************************************************************/
+import QtQml 2.14 as Qml
import QtQuick 2.4
import QtQuick.Controls 1.3
import QtQuick.Controls.Private 1.0
@@ -110,15 +111,17 @@ FocusScope {
}
}
- Binding {
+ Qml.Binding {
target: menu
property: "__minimumWidth"
value: button.width
+ restoreMode: Binding.RestoreBinding
}
- Binding {
+ Qml.Binding {
target: menu
property: "__visualItem"
value: button
+ restoreMode: Binding.RestoreBinding
}
}
View Lorry Controller Status