diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-10 14:23:53 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-10 14:24:28 +0100 |
| commit | 3f3e82fb05eb9eb9e03ccf8ed7de987b91e698ee (patch) | |
| tree | 484247f63e601abd8b012b86e6cde6ff56710cbb /src/imports/controls/material/material.pri | |
| parent | c3ff6b78ba8e0978bc408f6e3e490bcd32f6cfb0 (diff) | |
| parent | 6cdd4b53031de17b36b30b00de0a6945470a35ad (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/imports/controls/qtquickcontrols2plugin.cpp
Change-Id: Ifc09ea9f71fdba119fe8eed99f0bdcb402444f27
Diffstat (limited to 'src/imports/controls/material/material.pri')
| -rw-r--r-- | src/imports/controls/material/material.pri | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/imports/controls/material/material.pri b/src/imports/controls/material/material.pri index bda1fb21..457a8df1 100644 --- a/src/imports/controls/material/material.pri +++ b/src/imports/controls/material/material.pri @@ -30,6 +30,7 @@ QML_FILES += \ $$PWD/ElevationEffect.qml \ $$PWD/Frame.qml \ $$PWD/GroupBox.qml \ + $$PWD/HorizontalHeaderView.qml \ $$PWD/ItemDelegate.qml \ $$PWD/Label.qml \ $$PWD/Menu.qml \ @@ -68,4 +69,5 @@ QML_FILES += \ $$PWD/ToolButton.qml \ $$PWD/ToolSeparator.qml \ $$PWD/ToolTip.qml \ - $$PWD/Tumbler.qml + $$PWD/Tumbler.qml \ + $$PWD/VerticalHeaderView.qml |