diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-14 21:05:26 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-14 21:05:26 +0200 |
| commit | 4a090b8bf093aad5292fa7ee169e9c4f341a6c3c (patch) | |
| tree | 4831ee1c94cc12c9e120ec261cf2c38b7befd9ed /src/imports/controls/material | |
| parent | 5a61d637e08647045b26a96b51a0df3c2c35a47b (diff) | |
| parent | 645cfaef177fd5962ab1536bc06326a55d4a49e2 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I24ff9bec33e0bd8785e3d571212a7506b6501854
Diffstat (limited to 'src/imports/controls/material')
| -rw-r--r-- | src/imports/controls/material/plugins.qmltypes | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/imports/controls/material/plugins.qmltypes b/src/imports/controls/material/plugins.qmltypes index 7546a7b0..e290e0ea 100644 --- a/src/imports/controls/material/plugins.qmltypes +++ b/src/imports/controls/material/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Controls.Material 2.14' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Controls.Material 2.15' Module { dependencies: ["QtQuick.Controls 2.0"] @@ -328,6 +328,7 @@ Module { Property { name: "toolBarColor"; type: "QColor"; isReadonly: true } Property { name: "toolTextColor"; type: "QColor"; isReadonly: true } Property { name: "spinBoxDisabledIconColor"; type: "QColor"; isReadonly: true } + Property { name: "sliderDisabledColor"; revision: 15; type: "QColor"; isReadonly: true } Property { name: "touchTarget"; type: "int"; isReadonly: true } Property { name: "buttonHeight"; type: "int"; isReadonly: true } Property { name: "delegateHeight"; type: "int"; isReadonly: true } |