diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-12-20 16:51:31 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-12-20 16:51:54 +0100 |
| commit | 8148e5338de3c8d307f758c9ffcf1f7309fd48bd (patch) | |
| tree | 8c33cf73c8d83a0a77154a03ee0152e55d88b74e /src | |
| parent | 74b6f1705a237f426fdef530b46dde474d335095 (diff) | |
| parent | d0ba7b41f27fbfac366930a5e92b80e530b39630 (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Change-Id: I8544063279de0ce12438e867e6b7767b00e72f11
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/controls/material/DialogButtonBox.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/universal/DialogButtonBox.qml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/controls/material/DialogButtonBox.qml b/src/imports/controls/material/DialogButtonBox.qml index 312aa4eb..a596da91 100644 --- a/src/imports/controls/material/DialogButtonBox.qml +++ b/src/imports/controls/material/DialogButtonBox.qml @@ -36,6 +36,7 @@ import QtQuick 2.8 import QtQuick.Templates 2.1 as T +import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/universal/DialogButtonBox.qml b/src/imports/controls/universal/DialogButtonBox.qml index 043496d9..25e62bf5 100644 --- a/src/imports/controls/universal/DialogButtonBox.qml +++ b/src/imports/controls/universal/DialogButtonBox.qml @@ -36,6 +36,7 @@ import QtQuick 2.8 import QtQuick.Templates 2.1 as T +import QtQuick.Controls 2.1 import QtQuick.Controls.Universal 2.1 T.DialogButtonBox { |