diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-06-03 14:12:26 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-06-04 10:31:57 +0300 |
| commit | 30240c68c2c133c464460534081b865344a692ad (patch) | |
| tree | 0b5818b48212c2277152dfa3e96a041ab9efe266 /src/assistant | |
| parent | 096dfcf4f0d153546ca2bad4191b471c97731970 (diff) | |
| download | qttools-30240c68c2c133c464460534081b865344a692ad.tar.gz | |
Fix build with latest moc
Moc now needs the types to be fully declared and not just forward declared.
| src/assistant/help/Help_autogen/EWIEGA46WW/moc_qhelpindexwidget.cpp:299:1: required from here
| /usr/include/c++/9/type_traits:672:12: error: invalid use of incomplete type ‘struct QHelpLink’
| 672 | struct is_trivial
Change-Id: I8282132239da61d49512e1f9f2c5cc2c4a86e3e3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/assistant')
| -rw-r--r-- | src/assistant/assistant/helpenginewrapper.h | 3 | ||||
| -rw-r--r-- | src/assistant/help/qhelpcollectionhandler_p.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/assistant/assistant/helpenginewrapper.h b/src/assistant/assistant/helpenginewrapper.h index df2ec8a73..e43abec92 100644 --- a/src/assistant/assistant/helpenginewrapper.h +++ b/src/assistant/assistant/helpenginewrapper.h @@ -37,6 +37,8 @@ #include <QtGui/QFont> #include <QtGui/QFontDatabase> +#include "qhelplink.h" + QT_BEGIN_NAMESPACE class QFileSystemWatcher; @@ -47,7 +49,6 @@ class QHelpIndexWidget; class QHelpSearchEngine; class QHelpFilterEngine; class QHelpEngineCore; -struct QHelpLink; enum { ShowHomePage = 0, diff --git a/src/assistant/help/qhelpcollectionhandler_p.h b/src/assistant/help/qhelpcollectionhandler_p.h index 83178f388..b83b8ba26 100644 --- a/src/assistant/help/qhelpcollectionhandler_p.h +++ b/src/assistant/help/qhelpcollectionhandler_p.h @@ -60,12 +60,12 @@ #include <QtSql/QSqlQuery> #include "qhelpdbreader_p.h" +#include "qhelplink.h" QT_BEGIN_NAMESPACE class QVersionNumber; class QHelpFilterData; -struct QHelpLink; class QHelpCollectionHandler : public QObject { |