diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2020-11-26 00:04:11 +0100 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2020-11-26 08:09:48 +0100 |
| commit | 44cae613ffa934cc358b97994a65c54a9bc2d8a6 (patch) | |
| tree | 2c17a5a8d4530df42e01958c1ed5265c6eb4c273 /src/input/frontend | |
| parent | 2687a8b3c0428f0da71bef05324dfbdd3581fc20 (diff) | |
CMake: Build docs for Qt 3D
In order to pass correct Qt include paths to QDoc's Clang-based C++
parser, move the documentation project to be under src/core.
Pick-to: 6.0 6.0.0
Fixes: QTBUG-88838
Change-Id: Ie1608eb295d94f20ef0089f73f3df1aceb566c14
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/input/frontend')
| -rw-r--r-- | src/input/frontend/qabstractphysicaldeviceproxy_p.h | 2 | ||||
| -rw-r--r-- | src/input/frontend/qinputdeviceintegration_p.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/input/frontend/qabstractphysicaldeviceproxy_p.h b/src/input/frontend/qabstractphysicaldeviceproxy_p.h index 512679191..f41e22312 100644 --- a/src/input/frontend/qabstractphysicaldeviceproxy_p.h +++ b/src/input/frontend/qabstractphysicaldeviceproxy_p.h @@ -53,7 +53,9 @@ #include <Qt3DInput/qabstractphysicaldevice.h> +#ifndef Q_QDOC #include <Qt3DInput/private/qt3dinput_global_p.h> +#endif QT_BEGIN_NAMESPACE diff --git a/src/input/frontend/qinputdeviceintegration_p.h b/src/input/frontend/qinputdeviceintegration_p.h index 9a5618b04..b57c8f6e7 100644 --- a/src/input/frontend/qinputdeviceintegration_p.h +++ b/src/input/frontend/qinputdeviceintegration_p.h @@ -56,7 +56,9 @@ #include <Qt3DCore/qnodeid.h> #include <QtCore/QObject> +#ifndef Q_QDOC #include <Qt3DInput/private/qabstractphysicaldevicebackendnode_p.h> +#endif QT_BEGIN_NAMESPACE |