Make sure features are defined before testing them

Include the file defining the feature before testing whether
the feature exists. Also use the new feature macro to make
sure this bug doesn't happen again.

Change-Id: I204836fee59b143a7ce7d256a7aed223c4d0ceb1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

src/widgets/dialogs/qfontdialog.cpp

@@ -38,10 +38,10 @@
 ****************************************************************************/
 
 #include "qwindowdefs.h"
-
-#ifndef QT_NO_FONTDIALOG
-
 #include "qfontdialog.h"
+
+#if QT_CONFIG(fontdialog)
+
 #include "qfontdialog_p.h"
 
 #include <qapplication.h>
@@ -1051,4 +1051,4 @@ QT_END_NAMESPACE
 #include "qfontdialog.moc"
 #include "moc_qfontdialog.cpp"
 
-#endif // QT_NO_FONTDIALOG
+#endif // QT_CONFIG(fontdialog)

src/widgets/itemviews/qcolumnview.cpp

@@ -38,10 +38,10 @@
 ****************************************************************************/
 
 #include <qglobal.h>
-
-#ifndef QT_NO_COLUMNVIEW
-
 #include "qcolumnview.h"
+
+#if QT_CONFIG(columnview)
+
 #include "qcolumnview_p.h"
 #include "qcolumnviewgrip_p.h"
 
@@ -1170,4 +1170,4 @@ QT_END_NAMESPACE
 
 #include "moc_qcolumnview.cpp"
 
-#endif // QT_NO_COLUMNVIEW
+#endif // QT_CONFIG(columnview)

src/widgets/styles/qstylesheetstyle.cpp

@@ -38,10 +38,10 @@
 ****************************************************************************/
 
 #include <qglobal.h>
-
-#ifndef QT_NO_STYLE_STYLESHEET
-
 #include "qstylesheetstyle_p.h"
+
+#if QT_CONFIG(style_stylesheet)
+
 #include "private/qcssutil_p.h"
 #include <qdebug.h>
 #include <qapplication.h>
@@ -6024,4 +6024,4 @@ QT_END_NAMESPACE
 
 #include "moc_qstylesheetstyle_p.cpp"
 
-#endif // QT_NO_STYLE_STYLESHEET
+#endif // QT_CONFIG(style_stylesheet)