diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-05 09:19:45 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-05 09:19:46 +0100 |
| commit | 86f09add213e5067602f4bdf0cf659d693f03918 (patch) | |
| tree | 38eda1246edccab49bd4ecc952f8ea887983c3a1 /src/imports/controls/material/GroupBox.qml | |
| parent | 05597ef3e576a7cc09d193cb46dba490b7886ec1 (diff) | |
| parent | d3545dbdfdb30e310c6c962ba92f4fdf57354666 (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: I7fe9e74beff3cdbfbf02ee0f129a8204ad31046e
Diffstat (limited to 'src/imports/controls/material/GroupBox.qml')
| -rw-r--r-- | src/imports/controls/material/GroupBox.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/controls/material/GroupBox.qml b/src/imports/controls/material/GroupBox.qml index b07bb12d..e18a5949 100644 --- a/src/imports/controls/material/GroupBox.qml +++ b/src/imports/controls/material/GroupBox.qml @@ -35,9 +35,9 @@ ****************************************************************************/ import QtQuick 2.12 -import QtQuick.Templates 2.5 as T -import QtQuick.Controls.Material 2.5 -import QtQuick.Controls.Material.impl 2.5 +import QtQuick.Templates 2.12 as T +import QtQuick.Controls.Material 2.12 +import QtQuick.Controls.Material.impl 2.12 T.GroupBox { id: control |