3 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp
index c119b90001..66a2fdff96 100644
--- a/src/gui/kernel/qplatformdialoghelper.cpp
+++ b/src/gui/kernel/qplatformdialoghelper.cpp
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
 
 */
 
-static const quint32 buttonRoleLayouts[2][5][14] =
+static const int buttonRoleLayouts[2][5][14] =
 {
     // Qt::Horizontal
     {
@@ -800,7 +800,7 @@ QPlatformDialogHelper::ButtonRole QPlatformDialogHelper::buttonRole(QPlatformDia
     return InvalidRole;
 }
 
-const quint32 *QPlatformDialogHelper::buttonLayout(Qt::Orientation orientation, ButtonLayout policy)
+const int *QPlatformDialogHelper::buttonLayout(Qt::Orientation orientation, ButtonLayout policy)
 {
     if (policy == UnknownLayout) {
 #if defined (Q_OS_OSX)
diff --git a/src/gui/kernel/qplatformdialoghelper.h b/src/gui/kernel/qplatformdialoghelper.h
index 87fac83d50..731440723b 100644
--- a/src/gui/kernel/qplatformdialoghelper.h
+++ b/src/gui/kernel/qplatformdialoghelper.h
@@ -133,8 +133,8 @@ public:
         RoleMask        = 0x0FFFFFFF,
         AlternateRole   = 0x10000000,
         Stretch         = 0x20000000,
-        EOL             = 0x40000000,
-        Reverse         = 0x80000000
+        Reverse         = 0x40000000,
+        EOL             = InvalidRole
     };
 
     enum ButtonLayout {
@@ -160,7 +160,7 @@ public:
 
     static QVariant defaultStyleHint(QPlatformDialogHelper::StyleHint hint);
 
-    static const quint32 *buttonLayout(Qt::Orientation orientation = Qt::Horizontal, ButtonLayout policy = UnknownLayout);
+    static const int *buttonLayout(Qt::Orientation orientation = Qt::Horizontal, ButtonLayout policy = UnknownLayout);
     static ButtonRole buttonRole(StandardButton button);
 
 Q_SIGNALS:
diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp
index e24247b02f..3acd4f0701 100644
--- a/src/widgets/widgets/qdialogbuttonbox.cpp
+++ b/src/widgets/widgets/qdialogbuttonbox.cpp
@@ -266,7 +266,7 @@ void QDialogButtonBoxPrivate::layoutButtons()
             tmpPolicy = 4;  // Mac modeless
     }
 
-    const quint32 *currentLayout = QPlatformDialogHelper::buttonLayout(
+    const int *currentLayout = QPlatformDialogHelper::buttonLayout(
         orientation, static_cast<QPlatformDialogHelper::ButtonLayout>(tmpPolicy));
 
     if (center)