D16658: Respect the display property of buttons

[Marco Martin]

mart requested changes to this revision.
mart added inline comments.
This revision now requires changes to proceed.

INLINE COMMENTS

> Button.qml:44
> +     * and controlRoot.display != AbstractButton.IconOnly == 0 */
> +    Kirigami.MnemonicData.label: (controlRoot.display == undefined || controlRoot.display != 0) ? controlRoot.text : ""
>      Shortcut {

controlRoot.hasOwnProperty("display")

> Button.qml:65
> +             * and controlRoot.display != AbstractButton.TextOnly == 1 */
> +            "icon": controlRoot.icon && (controlRoot.display == undefined || controlRoot.display != 1) ? (controlRoot.icon.name || controlRoot.icon.source) : "",
>              "iconColor": controlRoot.icon && controlRoot.icon.color.a > 0? controlRoot.icon.color : Kirigami.Theme.textColor,

controlRoot.display == undefined needs to become controlRoot.hasOwnProperty("display") this would be false with Qt 5.9 and less,  protecting controlRoot.display != 1
also add the following comment:
//FIXME: when we can depend from Qt 5.10 do controlRoot.display !== T.AbstractButton.TextOnly

REPOSITORY
  R858 Qt Quick Controls 2: Desktop Style

REVISION DETAIL
  https://phabricator.kde.org/D16658

To: astippich, #plasma, apol, mart
Cc: plasma-devel, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20181123/a464fd8e/attachment.html>