3 files changed, 7 insertions, 12 deletions
diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp
index b96492d623..94911d1cb1 100644
--- a/src/widgets/widgets/qcalendarwidget.cpp
+++ b/src/widgets/widgets/qcalendarwidget.cpp
@@ -39,8 +39,6 @@
 
 #include "qcalendarwidget.h"
 
-#ifndef QT_NO_CALENDARWIDGET
-
 #include <qabstractitemmodel.h>
 #include <qitemdelegate.h>
 #include <qdatetime.h>
@@ -3129,5 +3127,3 @@ QT_END_NAMESPACE
 
 #include "qcalendarwidget.moc"
 #include "moc_qcalendarwidget.cpp"
-
-#endif //QT_NO_CALENDARWIDGET
diff --git a/src/widgets/widgets/qcalendarwidget.h b/src/widgets/widgets/qcalendarwidget.h
index 7780065117..29e2ff698b 100644
--- a/src/widgets/widgets/qcalendarwidget.h
+++ b/src/widgets/widgets/qcalendarwidget.h
@@ -44,10 +44,9 @@
 #include <QtWidgets/qwidget.h>
 #include <QtCore/qdatetime.h>
 
-QT_BEGIN_NAMESPACE
-
+QT_REQUIRE_CONFIG(calendarwidget);
 
-#ifndef QT_NO_CALENDARWIDGET
+QT_BEGIN_NAMESPACE
 
 class QDate;
 class QTextCharFormat;
@@ -184,9 +183,6 @@ private:
 
 };
 
-#endif // QT_NO_CALENDARWIDGET
-
 QT_END_NAMESPACE
 
 #endif // QCALENDARWIDGET_H
-
diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri
index 610932c6ce..ee510bd120 100644
--- a/src/widgets/widgets/widgets.pri
+++ b/src/widgets/widgets/widgets.pri
@@ -5,7 +5,6 @@ HEADERS += \
         widgets/qbuttongroup_p.h \
         widgets/qabstractspinbox.h \
         widgets/qabstractspinbox_p.h \
-        widgets/qcalendarwidget.h \
         widgets/qcombobox.h \
         widgets/qcombobox_p.h \
         widgets/qdial.h \
@@ -67,7 +66,6 @@ HEADERS += \
 SOURCES += \
         widgets/qbuttongroup.cpp \
         widgets/qabstractspinbox.cpp \
-        widgets/qcalendarwidget.cpp \
         widgets/qcombobox.cpp \
         widgets/qdial.cpp \
         widgets/qdockwidget.cpp \
@@ -129,6 +127,11 @@ qtConfig(abstractslider) {
         widgets/qabstractslider.cpp
 }
 
+qtConfig(calendarwidget) {
+    HEADERS += widgets/qcalendarwidget.h
+    SOURCES += widgets/qcalendarwidget.cpp
+}
+
 qtConfig(checkbox) {
     HEADERS += \
         widgets/qcheckbox.h