2 files changed, 7 insertions, 3 deletions
diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp
index deb8a02961..b20a1449eb 100644
--- a/src/widgets/dialogs/qfontdialog.cpp
+++ b/src/widgets/dialogs/qfontdialog.cpp
@@ -38,10 +38,10 @@
 ****************************************************************************/
 
 #include "qwindowdefs.h"
+#include "qfontdialog.h"
 
-#ifndef QT_NO_FONTDIALOG
+#if QT_CONFIG(fontdialog)
 
-#include "qfontdialog.h"
 #include "qfontdialog_p.h"
 
 #include <qapplication.h>
@@ -1050,4 +1050,4 @@ QT_END_NAMESPACE
 #include "qfontdialog.moc"
 #include "moc_qfontdialog.cpp"
 
-#endif // QT_NO_FONTDIALOG
+#endif // QT_CONFIG(fontdialog)
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp
index 57b3f47863..98d070e493 100644
--- a/src/widgets/dialogs/qmessagebox.cpp
+++ b/src/widgets/dialogs/qmessagebox.cpp
@@ -336,8 +336,10 @@ void QMessageBoxPrivate::setupLayout()
 #else
     grid->addWidget(buttonBox, grid->rowCount(), 0, 1, grid->columnCount());
 #endif
+#if QT_CONFIG(textedit)
     if (detailsText)
         grid->addWidget(detailsText, grid->rowCount(), 0, 1, grid->columnCount());
+#endif
     grid->setSizeConstraint(QLayout::SetNoConstraint);
     q->setLayout(grid);
 
@@ -2654,7 +2656,9 @@ void QMessageBoxPrivate::helperPrepareShow(QPlatformDialogHelper *)
     options->setWindowTitle(q->windowTitle());
     options->setText(q->text());
     options->setInformativeText(q->informativeText());
+#if QT_CONFIG(textedit)
     options->setDetailedText(q->detailedText());
+#endif
     options->setIcon(helperIcon(q->icon()));
     options->setStandardButtons(helperStandardButtons(q));
 }