diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h
index c2949c3022..ae7f3a5050 100644
--- a/src/corelib/kernel/qproperty.h
+++ b/src/corelib/kernel/qproperty.h
@@ -400,7 +400,7 @@ public:
     {}
 #else
     template <typename Functor>
-    explicit QProperty(Class *owner, Functor &&f);
+    explicit QNotifiedProperty(Class *owner, Functor &&f);
 #endif
 
     ~QNotifiedProperty() = default;
diff --git a/src/corelib/text/qstringconverter.h b/src/corelib/text/qstringconverter.h
index 8766968e6d..9eba8bc437 100644
--- a/src/corelib/text/qstringconverter.h
+++ b/src/corelib/text/qstringconverter.h
@@ -50,7 +50,7 @@
 QT_BEGIN_NAMESPACE
 
 // work around a compiler bug in GCC 7
-#if defined(Q_CC_GNU) && __GNUC__ == 7
+#if (defined(Q_CC_GNU) && __GNUC__ == 7) || defined(Q_QDOC)
 #define QSTRINGCONVERTER_CONSTEXPR
 #else
 #define QSTRINGCONVERTER_CONSTEXPR constexpr
diff --git a/src/gui/kernel/qwindowdefs.h b/src/gui/kernel/qwindowdefs.h
index 5d4955c436..172cc593d1 100644
--- a/src/gui/kernel/qwindowdefs.h
+++ b/src/gui/kernel/qwindowdefs.h
@@ -88,7 +88,7 @@ QT_END_NAMESPACE
 // Window system dependent definitions
 
 
-#if defined(Q_OS_WIN)
+#if defined(Q_OS_WIN) || defined(Q_QDOC)
 #  include <QtGui/qwindowdefs_win.h>
 #endif // Q_OS_WIN