From 85b0335c419118629b05b7c8891b844387382700 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Wed, 2 Sep 2020 11:32:13 +0200
Subject: Tighten up QDialogButtonBox::ButtonLayout enum
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

... and the equivalent enum in QPlatformDialogHelper.

No need to keep numerical values the same anymore.
Remove ### Qt 6 comment.

Change-Id: Ib369ea6ca2362f6ab0f71a3a6c90c4adaa7f11cd
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/widgets/widgets/qdialogbuttonbox.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/widgets/widgets')

diff --git a/src/widgets/widgets/qdialogbuttonbox.h b/src/widgets/widgets/qdialogbuttonbox.h
index a9a1a3453d..46a1d616d7 100644
--- a/src/widgets/widgets/qdialogbuttonbox.h
+++ b/src/widgets/widgets/qdialogbuttonbox.h
@@ -113,8 +113,7 @@ public:
         MacLayout,
         KdeLayout,
         GnomeLayout,
-        // MacModelessLayout,
-        AndroidLayout = GnomeLayout + 2 // ### Qt 6: reorder
+        AndroidLayout
     };
 
     QDialogButtonBox(QWidget *parent = nullptr);
-- 
cgit v1.2.3