diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-10-02 12:43:06 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-10-02 12:43:48 +0200 |
| commit | 63d832bcae98104bf071096605fc27a59a52254c (patch) | |
| tree | ba2fd42487c5889aad0b80aaddb0f304a690b561 /src/controls/Private/BasicButton.qml | |
| parent | 53ff51b61a3ecfc485d7c8ec6d9a5b61d2791719 (diff) | |
| parent | a21a33fe79e82a7bd3471612b46106ac1343648f (diff) | |
| download | qtquickcontrols-63d832bcae98104bf071096605fc27a59a52254c.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ie26c941c33fdd8baab49dc13b84d02e2b83af5e1
Diffstat (limited to 'src/controls/Private/BasicButton.qml')
| -rw-r--r-- | src/controls/Private/BasicButton.qml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/controls/Private/BasicButton.qml b/src/controls/Private/BasicButton.qml index 9a9cf71e..346cd419 100644 --- a/src/controls/Private/BasicButton.qml +++ b/src/controls/Private/BasicButton.qml @@ -147,6 +147,7 @@ Control { Action { id: ownAction + enabled: button.enabled iconSource: !button.action || __iconOverriden ? button.iconSource : "" iconName: !button.action || __iconOverriden ? button.iconName : "" |