diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-12-20 20:07:34 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-12-20 20:07:34 +0100 |
| commit | 6e46d74b4d04fbf21ec7e57418ab5568f786b0e7 (patch) | |
| tree | 8735964204723ad84af7a19b1d2eaca31c7d8f78 /src/imports/controls | |
| parent | 66cca16867594f27b6d9e44101f1bd34d165c8ac (diff) | |
| parent | 8148e5338de3c8d307f758c9ffcf1f7309fd48bd (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/imports/controls/material/DialogButtonBox.qml
src/imports/controls/universal/DialogButtonBox.qml
Change-Id: I16cbf9912a3526783c21a6f30996f83fce9e02c3
Diffstat (limited to 'src/imports/controls')
| -rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols2-button-focused.png | bin | 1482 -> 0 bytes | |||
| -rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols2-button-normal.png | bin | 1257 -> 0 bytes | |||
| -rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png | bin | 1196 -> 0 bytes | |||
| -rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png | bin | 2633 -> 0 bytes | |||
| -rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png | bin | 2532 -> 0 bytes | |||
| -rw-r--r-- | src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png | bin | 2249 -> 0 bytes | |||
| -rw-r--r-- | src/imports/controls/material/DialogButtonBox.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/universal/DialogButtonBox.qml | 1 |
8 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png Binary files differdeleted file mode 100644 index a487bd27..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png Binary files differdeleted file mode 100644 index 7e7e281b..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png b/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png Binary files differdeleted file mode 100644 index 2dff7764..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png Binary files differdeleted file mode 100644 index 060d2b2a..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png Binary files differdeleted file mode 100644 index 2384f76a..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png +++ /dev/null diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png Binary files differdeleted file mode 100644 index 5f84f62a..00000000 --- a/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png +++ /dev/null diff --git a/src/imports/controls/material/DialogButtonBox.qml b/src/imports/controls/material/DialogButtonBox.qml index 34ee0913..82d988cc 100644 --- a/src/imports/controls/material/DialogButtonBox.qml +++ b/src/imports/controls/material/DialogButtonBox.qml @@ -36,6 +36,7 @@ import QtQuick 2.9 import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.2 import QtQuick.Controls.Material 2.2 import QtQuick.Controls.Material.impl 2.2 diff --git a/src/imports/controls/universal/DialogButtonBox.qml b/src/imports/controls/universal/DialogButtonBox.qml index 4c7d3a21..0ab84db8 100644 --- a/src/imports/controls/universal/DialogButtonBox.qml +++ b/src/imports/controls/universal/DialogButtonBox.qml @@ -36,6 +36,7 @@ import QtQuick 2.9 import QtQuick.Templates 2.2 as T +import QtQuick.Controls 2.2 import QtQuick.Controls.Universal 2.2 T.DialogButtonBox { |
