diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-07 11:05:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-07 11:05:13 +0100 |
| commit | 73bf08d2cdabb8499acf9c63b942f8df8ac0c7c1 (patch) | |
| tree | f97b18c429b491e65eb40e13a9d4d17ebc7a659e /src/dialogs | |
| parent | 428c594b59a779558e48be8e61f3b65a4a141ed1 (diff) | |
| parent | 1836451c18c557dbfc332124ef4645b3ba2bc9d4 (diff) | |
| download | qtquickcontrols-73bf08d2cdabb8499acf9c63b942f8df8ac0c7c1.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Id9c8ce5b56ecd279daaebef2923ea90d4bfc0447
Diffstat (limited to 'src/dialogs')
| -rw-r--r-- | src/dialogs/DefaultDialogWrapper.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dialogs/DefaultDialogWrapper.qml b/src/dialogs/DefaultDialogWrapper.qml index c2ffffb7..a34ee97d 100644 --- a/src/dialogs/DefaultDialogWrapper.qml +++ b/src/dialogs/DefaultDialogWrapper.qml @@ -135,7 +135,7 @@ AbstractDialog { function setupButtons() { buttonsLeftRepeater.model = root.__standardButtonsLeftModel() buttonsRightRepeater.model = root.__standardButtonsRightModel() - if (!buttonsRightRepeater.model || buttonsRightRepeater.model.length < 2) + if (buttonsLeftRepeater.count + buttonsRightRepeater.count < 2) return; var calcWidth = 0; |