QDoc: Always depend on QmlPrivate

Make Qml a hard dependency for QDoc.

- There are no known usecases for running QDoc without qml support.
- We're not testing QDoc without qml support, as it's not officially
  supported.
- There are known issues with parsing certain file types when qml
  support is missing.
- Dropping feature checks makes the code easier to reason about and thus
  maintain.
- Clean up some of the configure and CMake configuration that's affected
  by the change.

[ChangeLog][QDoc] QDoc now requires the library QmlPrivate. Make sure
the qtdeclarative module is available.

Fixes: QTBUG-111673
Change-Id: I3a8aa20ace3c379c3896b9f59aa4e8113cd9a873
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

1 files changed, 2 insertions, 7 deletions

diff --git a/src/qdoc/qmlvisitor.cpp b/src/qdoc/qmlvisitor.cpp
index 9e70a356a..04e60e427 100644
--- a/src/qdoc/qmlvisitor.cpp
+++ b/src/qdoc/qmlvisitor.cpp
@@ -17,14 +17,11 @@
 #include <QtCore/qfileinfo.h>
 #include <QtCore/qglobal.h>
 
-#ifndef QT_NO_DECLARATIVE
-#    include <private/qqmljsast_p.h>
-#    include <private/qqmljsengine_p.h>
-#endif
+#include <private/qqmljsast_p.h>
+#include <private/qqmljsengine_p.h>
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_DECLARATIVE
 /*!
   The constructor stores all the parameters in local data members.
  */
@@ -709,6 +706,4 @@ bool QmlDocVisitor::hasError() const
     return hasRecursionDepthError;
 }
 
-#endif
-
 QT_END_NAMESPACE