From 5c62fd9a2e01047074b3594153e5652794ac6a36 Mon Sep 17 00:00:00 2001
From: Stephan Binner <stephan.binner@basyskom.com>
Date: Thu, 2 Mar 2017 09:20:00 +0100
Subject: Add feature.dialogbuttonbox

Change-Id: I8c136024c3bf431529033a806be646d867919daa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/widgets/widgets/qdialogbuttonbox.h |  2 ++
 src/widgets/widgets/qpushbutton.cpp    |  5 +++--
 src/widgets/widgets/widgets.pri        | 10 ++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'src/widgets/widgets')

diff --git a/src/widgets/widgets/qdialogbuttonbox.h b/src/widgets/widgets/qdialogbuttonbox.h
index 00ec315555..af9e705234 100644
--- a/src/widgets/widgets/qdialogbuttonbox.h
+++ b/src/widgets/widgets/qdialogbuttonbox.h
@@ -43,6 +43,8 @@
 #include <QtWidgets/qtwidgetsglobal.h>
 #include <QtWidgets/qwidget.h>
 
+QT_REQUIRE_CONFIG(dialogbuttonbox);
+
 QT_BEGIN_NAMESPACE
 
 
diff --git a/src/widgets/widgets/qpushbutton.cpp b/src/widgets/widgets/qpushbutton.cpp
index d8eae724ee..20758679f0 100644
--- a/src/widgets/widgets/qpushbutton.cpp
+++ b/src/widgets/widgets/qpushbutton.cpp
@@ -55,7 +55,9 @@
 #include "qtoolbar.h"
 #include "qdebug.h"
 #include "qlayoutitem.h"
+#if QT_CONFIG(dialogbuttonbox)
 #include "qdialogbuttonbox.h"
+#endif
 #if 0 // Used to be included in Qt4 for Q_WS_MAC
 #include "private/qmacstyle_mac_p.h"
 #include "private/qmacstyle_mac_p_p.h"
@@ -400,8 +402,7 @@ QSize QPushButton::sizeHint() const
     initStyleOption(&opt);
 
     // calculate contents size...
-#ifndef QT_NO_ICON
-
+#if !defined(QT_NO_ICON) && QT_CONFIG(dialogbuttonbox)
     bool showButtonBoxIcons = qobject_cast<QDialogButtonBox*>(parentWidget())
                           && style()->styleHint(QStyle::SH_DialogButtonBox_ButtonsHaveIcons);
 
diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri
index 7628a86459..bc36105849 100644
--- a/src/widgets/widgets/widgets.pri
+++ b/src/widgets/widgets/widgets.pri
@@ -16,7 +16,6 @@ HEADERS += \
         widgets/qdatetimeedit.h \
         widgets/qdatetimeedit_p.h \
         widgets/qdial.h \
-        widgets/qdialogbuttonbox.h \
         widgets/qdockwidget.h \
         widgets/qdockwidget_p.h \
         widgets/qdockarealayout_p.h \
@@ -90,7 +89,6 @@ SOURCES += \
         widgets/qcombobox.cpp \
         widgets/qdatetimeedit.cpp \
         widgets/qdial.cpp \
-        widgets/qdialogbuttonbox.cpp \
         widgets/qdockwidget.cpp \
         widgets/qdockarealayout.cpp \
         widgets/qeffects.cpp \
@@ -163,6 +161,14 @@ qtConfig(radiobutton) {
         widgets/qradiobutton.cpp
 }
 
+qtConfig(dialogbuttonbox) {
+    HEADERS += \
+        widgets/qdialogbuttonbox.h
+
+    SOURCES += \
+        widgets/qdialogbuttonbox.cpp
+}
+
 macx {
     HEADERS += \
         widgets/qmacnativewidget_mac.h \
-- 
cgit v1.2.3