whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qfuturewatcher_p.h: fix missing qfuturewatcher.h include 

Extending headersclean_check to private headers has shown that
Q_DECLARE_PUBLIC needs to know the Public class in-size, so a
forward-declaration is not enough. Says Clang:

  qfuturewatcher_p.h:31:5: error: static_cast from 'QObject *' to 'QFutureWatcherBase *', which are not related by inheritance, is not allowed
      Q_DECLARE_PUBLIC(QFutureWatcherBase)
      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Amends the start of the public history.

Pick-to: 6.7 6.5 6.2 5.15
Task-number: QTBUG-126219
Change-Id: I1e132aaa844f5c87d57446e8818280fd141d2b1e
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit b58d926090620079f602f4f2ce9f17fe7025c962)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
bb10
Marc Mutz 2024-06-11 12:01:12 +02:00 committed by Qt Cherry-pick Bot
parent aaeb4970fd
commit d908c6162c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/thread/qfuturewatcher_p.h
View File

@ -15,6 +15,8 @@
// We mean it.
//
#include <QtCore/qfuturewatcher.h>
#include "qfutureinterface_p.h"
#include <qlist.h>
@ -24,7 +26,6 @@ QT_REQUIRE_CONFIG(future);
QT_BEGIN_NAMESPACE
class QFutureWatcherBase;
class QFutureWatcherBasePrivate : public QObjectPrivate,
public QFutureCallOutInterface
{