diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-01-20 12:55:54 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-01-20 12:55:54 +0100 |
commit | bc29da5c224d277dfa94ae4e188df1db325ae83a (patch) | |
tree | 19eef227a11ab099fd04b909d326201ae7df7d8d /src/imports/controls | |
parent | 5934c9670eaa6f0464c45857d72bcebf64902cc4 (diff) | |
parent | c1b1e9a69a5770a59d0a4e59650c6487b9cd5439 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/quicktemplates2/qquickswitch.cpp
src/quicktemplates2/qquickswitchdelegate.cpp
tests/auto/controls/data/tst_dialogbuttonbox.qml
tests/auto/controls/data/tst_toolbutton.qml
Change-Id: I1da1d6de83c1d9ac854dfce1d6c9d6ba2c460404
Diffstat (limited to 'src/imports/controls')
-rw-r--r-- | src/imports/controls/designer/images/roundbutton-icon.png | bin | 0 -> 223 bytes | |||
-rw-r--r-- | src/imports/controls/designer/images/roundbutton-icon16.png | bin | 0 -> 178 bytes | |||
-rw-r--r-- | src/imports/controls/designer/images/roundbutton-icon16@2x.png | bin | 0 -> 219 bytes | |||
-rw-r--r-- | src/imports/controls/designer/images/roundbutton-icon@2x.png | bin | 0 -> 310 bytes | |||
-rw-r--r-- | src/imports/controls/designer/images/stackview-icon.png | bin | 0 -> 157 bytes | |||
-rw-r--r-- | src/imports/controls/designer/images/stackview-icon16.png | bin | 0 -> 147 bytes | |||
-rw-r--r-- | src/imports/controls/designer/images/swipeview-icon.png | bin | 0 -> 157 bytes | |||
-rw-r--r-- | src/imports/controls/designer/images/swipeview-icon16.png | bin | 0 -> 147 bytes | |||
-rw-r--r-- | src/imports/controls/designer/qtquickcontrols2.metainfo | 46 | ||||
-rw-r--r-- | src/imports/controls/material/ComboBox.qml | 2 |
10 files changed, 48 insertions, 0 deletions
diff --git a/src/imports/controls/designer/images/roundbutton-icon.png b/src/imports/controls/designer/images/roundbutton-icon.png Binary files differnew file mode 100644 index 00000000..35d28fab --- /dev/null +++ b/src/imports/controls/designer/images/roundbutton-icon.png diff --git a/src/imports/controls/designer/images/roundbutton-icon16.png b/src/imports/controls/designer/images/roundbutton-icon16.png Binary files differnew file mode 100644 index 00000000..5dc3a895 --- /dev/null +++ b/src/imports/controls/designer/images/roundbutton-icon16.png diff --git a/src/imports/controls/designer/images/roundbutton-icon16@2x.png b/src/imports/controls/designer/images/roundbutton-icon16@2x.png Binary files differnew file mode 100644 index 00000000..10c13149 --- /dev/null +++ b/src/imports/controls/designer/images/roundbutton-icon16@2x.png diff --git a/src/imports/controls/designer/images/roundbutton-icon@2x.png b/src/imports/controls/designer/images/roundbutton-icon@2x.png Binary files differnew file mode 100644 index 00000000..81150e3d --- /dev/null +++ b/src/imports/controls/designer/images/roundbutton-icon@2x.png diff --git a/src/imports/controls/designer/images/stackview-icon.png b/src/imports/controls/designer/images/stackview-icon.png Binary files differnew file mode 100644 index 00000000..bbd6783c --- /dev/null +++ b/src/imports/controls/designer/images/stackview-icon.png diff --git a/src/imports/controls/designer/images/stackview-icon16.png b/src/imports/controls/designer/images/stackview-icon16.png Binary files differnew file mode 100644 index 00000000..3f7ab00c --- /dev/null +++ b/src/imports/controls/designer/images/stackview-icon16.png diff --git a/src/imports/controls/designer/images/swipeview-icon.png b/src/imports/controls/designer/images/swipeview-icon.png Binary files differnew file mode 100644 index 00000000..bbd6783c --- /dev/null +++ b/src/imports/controls/designer/images/swipeview-icon.png diff --git a/src/imports/controls/designer/images/swipeview-icon16.png b/src/imports/controls/designer/images/swipeview-icon16.png Binary files differnew file mode 100644 index 00000000..3f7ab00c --- /dev/null +++ b/src/imports/controls/designer/images/swipeview-icon16.png diff --git a/src/imports/controls/designer/qtquickcontrols2.metainfo b/src/imports/controls/designer/qtquickcontrols2.metainfo index c697b3c2..35cfa0f2 100644 --- a/src/imports/controls/designer/qtquickcontrols2.metainfo +++ b/src/imports/controls/designer/qtquickcontrols2.metainfo @@ -440,4 +440,50 @@ MetaInfo { Property { name: "text"; type: "binding"; value: "qsTr(\"Tab Button\")" } } } + + Type { + name: "QtQuick.Controls.RoundButton" + icon: "images/roundbutton-icon16.png" + + ItemLibraryEntry { + name: "Round Button" + category: "Qt Quick - Controls 2" + libraryIcon: "images/roundbutton-icon.png" + version: "2.1" + requiredImport: "QtQuick.Controls" + Property { name: "text"; type: "string"; value: "+" } + } + } + + Type { + name: "QtQuick.Controls.StackView" + icon: "images/stackview-icon16.png" + + ItemLibraryEntry { + name: "stack View" + category: "Qt Quick - Views" + libraryIcon: "images/stackview-icon.png" + version: "2.1" + requiredImport: "QtQuick.Controls" + + Property { name: "width"; type: "int"; value: 200 } + Property { name: "height"; type: "int"; value: 200 } + } + } + + Type { + name: "QtQuick.Controls.SwipeView" + icon: "images/swipeview-icon16.png" + + ItemLibraryEntry { + name: "Swipe View" + category: "Qt Quick - Views" + libraryIcon: "images/swipeview-icon.png" + version: "2.0" + requiredImport: "QtQuick.Controls" + + Property { name: "width"; type: "int"; value: 200 } + Property { name: "height"; type: "int"; value: 200 } + } + } } diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index 2bdf9afa..0721e8f3 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -71,6 +71,8 @@ T.ComboBox { x: control.mirrored ? control.padding : control.width - width - control.padding y: control.topPadding + (control.availableHeight - height) / 2 source: "image://material/drop-indicator/" + (control.enabled ? control.Material.foreground : control.Material.hintTextColor) + sourceSize.width: width + sourceSize.height: height } contentItem: T.TextField { |