summaryrefslogtreecommitdiff
path: root/src/extras
diff options
context:
space:
mode:
Diffstat (limited to 'src/extras')
-rw-r--r--src/extras/DelayButton.qml4
-rw-r--r--src/extras/Styles/Flat/ApplicationWindowStyle.qml5
-rw-r--r--src/extras/Styles/Flat/GroupBoxStyle.qml5
-rw-r--r--src/extras/Tumbler.qml4
4 files changed, 13 insertions, 5 deletions
diff --git a/src/extras/DelayButton.qml b/src/extras/DelayButton.qml
index 6bace4ed..9a0c3a25 100644
--- a/src/extras/DelayButton.qml
+++ b/src/extras/DelayButton.qml
@@ -37,6 +37,7 @@
**
****************************************************************************/
+import QtQml 2.14 as Qml
import QtQuick 2.2
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
@@ -112,11 +113,12 @@ Button {
}
}
- Binding {
+ Qml.Binding {
// Force checkable to false to get full control over the checked -property
target: root
property: "checkable"
value: false
+ restoreMode: Binding.RestoreBinding
}
onProgressChanged: {
diff --git a/src/extras/Styles/Flat/ApplicationWindowStyle.qml b/src/extras/Styles/Flat/ApplicationWindowStyle.qml
index f4fbd24a..222c9f7c 100644
--- a/src/extras/Styles/Flat/ApplicationWindowStyle.qml
+++ b/src/extras/Styles/Flat/ApplicationWindowStyle.qml
@@ -36,7 +36,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.14
import QtQuick.Controls 1.2
import QtQuick.Controls.Styles 1.4 as Base
import QtQuick.Controls.Styles.Flat 1.0
@@ -103,12 +103,13 @@ Base.ApplicationWindowStyle {
items: control.menuBar ? control.menuBar.menus : []
}
- Binding {
+ Qml.Binding {
target: control.toolBar
property: "__menu"
value: proxyMenu.items.length > 1 ? proxyMenu :
proxyMenu.items.length === 1 ? proxyMenu.items[0] : null
when: hasToolBar
+ restoreMode: Binding.RestoreBinding
}
}
}
diff --git a/src/extras/Styles/Flat/GroupBoxStyle.qml b/src/extras/Styles/Flat/GroupBoxStyle.qml
index c932262b..797086a2 100644
--- a/src/extras/Styles/Flat/GroupBoxStyle.qml
+++ b/src/extras/Styles/Flat/GroupBoxStyle.qml
@@ -36,6 +36,8 @@
** $QT_END_LICENSE$
**
****************************************************************************/
+
+import QtQml 2.14 as Qml
import QtQuick 2.2
import QtQuick.Controls.Private 1.0 as Private
import QtQuick.Controls.Styles.Flat 1.0
@@ -67,10 +69,11 @@ Private.GroupBoxStyle {
}
// TODO:
- Binding {
+ Qml.Binding {
target: root.padding
property: "top"
value: background.anchors.topMargin + root.spacing
+ restoreMode: Binding.RestoreBinding
}
CheckBoxDrawer {
diff --git a/src/extras/Tumbler.qml b/src/extras/Tumbler.qml
index 299ac83e..a6208708 100644
--- a/src/extras/Tumbler.qml
+++ b/src/extras/Tumbler.qml
@@ -37,6 +37,7 @@
**
****************************************************************************/
+import QtQml 2.14 as Qml
import QtQuick 2.2
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
@@ -330,10 +331,11 @@ Control {
visible: columnObject.visible
clip: true
- Binding {
+ Qml.Binding {
target: columnObject
property: "__currentIndex"
value: columnPathView.currentIndex
+ restoreMode: Binding.RestoreBinding
}
// We add one here so that the delegate's don't just appear in the view instantly,