diff --git a/src/printsupport/configure.json b/src/printsupport/configure.json
index 8d2a6334818..ad38281145e 100644
--- a/src/printsupport/configure.json
+++ b/src/printsupport/configure.json
@@ -40,7 +40,8 @@
                 "features.combobox",
                 "features.cups",
                 "features.datetimeedit",
-                "features.groupbox"
+                "features.groupbox",
+                "features.tablewidget"
             ],
             "output": [ "privateFeature", "feature" ]
         },
diff --git a/src/widgets/itemviews/itemviews.pri b/src/widgets/itemviews/itemviews.pri
index ed0e3fe0722..799458e4adb 100644
--- a/src/widgets/itemviews/itemviews.pri
+++ b/src/widgets/itemviews/itemviews.pri
@@ -19,8 +19,6 @@ HEADERS += \
 	itemviews/qdirmodel.h \
 	itemviews/qlistwidget.h \
 	itemviews/qlistwidget_p.h \
-	itemviews/qtablewidget.h \
-        itemviews/qtablewidget_p.h \
 	itemviews/qtreewidget.h \
 	itemviews/qtreewidget_p.h \
 	itemviews/qwidgetitemdata_p.h \
@@ -41,7 +39,6 @@ SOURCES += \
         itemviews/qitemdelegate.cpp \
 	itemviews/qdirmodel.cpp \
 	itemviews/qlistwidget.cpp \
-	itemviews/qtablewidget.cpp \
 	itemviews/qtreewidget.cpp \
 	itemviews/qitemeditorfactory.cpp \
 	itemviews/qtreewidgetitemiterator.cpp \
@@ -60,6 +57,14 @@ qtConfig(columnview) {
         itemviews/qcolumnviewgrip.cpp
 }
 
+qtConfig(tablewidget) {
+    HEADERS += \
+        itemviews/qtablewidget.h \
+        itemviews/qtablewidget_p.h
+
+    SOURCES += itemviews/qtablewidget.cpp
+}
+
 HEADERS += \
     itemviews/qfileiconprovider.h \
     itemviews/qfileiconprovider_p.h \
diff --git a/src/widgets/itemviews/qtablewidget.cpp b/src/widgets/itemviews/qtablewidget.cpp
index 663cd4adc6a..3ff75cc23b2 100644
--- a/src/widgets/itemviews/qtablewidget.cpp
+++ b/src/widgets/itemviews/qtablewidget.cpp
@@ -39,7 +39,6 @@
 
 #include "qtablewidget.h"
 
-#ifndef QT_NO_TABLEWIDGET
 #include <qitemdelegate.h>
 #include <qpainter.h>
 #include <private/qtablewidget_p.h>
@@ -2715,5 +2714,3 @@ QT_END_NAMESPACE
 
 #include "moc_qtablewidget.cpp"
 #include "moc_qtablewidget_p.cpp"
-
-#endif // QT_NO_TABLEWIDGET
diff --git a/src/widgets/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h
index b91bcf7ce48..d3bcba57dd5 100644
--- a/src/widgets/itemviews/qtablewidget.h
+++ b/src/widgets/itemviews/qtablewidget.h
@@ -44,13 +44,11 @@
 #include <QtWidgets/qtableview.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qvector.h>
-//#include <QtWidgets/qitemselectionmodel.h>
+
+QT_REQUIRE_CONFIG(tablewidget);
 
 QT_BEGIN_NAMESPACE
 
-
-#ifndef QT_NO_TABLEWIDGET
-
 class Q_WIDGETS_EXPORT QTableWidgetSelectionRange
 {
 public:
@@ -369,8 +367,6 @@ inline void QTableWidgetItem::setSelected(bool aselect)
 inline bool QTableWidgetItem::isSelected() const
 { return (view ? view->isItemSelected(this) : false); }
 
-#endif // QT_NO_TABLEWIDGET
-
 QT_END_NAMESPACE
 
 #endif // QTABLEWIDGET_H
diff --git a/src/widgets/itemviews/qtablewidget_p.h b/src/widgets/itemviews/qtablewidget_p.h
index 2db7337cd6e..6412477be0e 100644
--- a/src/widgets/itemviews/qtablewidget_p.h
+++ b/src/widgets/itemviews/qtablewidget_p.h
@@ -58,7 +58,7 @@
 #include <private/qtableview_p.h>
 #include <private/qwidgetitemdata_p.h>
 
-#ifndef QT_NO_TABLEWIDGET
+QT_REQUIRE_CONFIG(tablewidget);
 
 QT_BEGIN_NAMESPACE
 
@@ -218,6 +218,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_TABLEWIDGET
-
 #endif // QTABLEWIDGET_P_H