diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2021-11-04 11:51:50 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2021-11-23 21:23:44 +0100 |
| commit | f5f7f78766d62b7192b98b96bbd68dab1961e54e (patch) | |
| tree | 1abad0147df9d13a403177c38c37a24ceb3487ea /src/corelib/kernel/qobject.h | |
| parent | 0347b4ee5e5cabe6c3de6effa400494462dda10d (diff) | |
QObject: don't #include qproperty.h
The qobject.h header needs QBindingStorage in-size and QBindable
in-name-only. The former was moved to its own header in a previous
commit, which we include now, while the latter can just be
forward-declared. This allows dropping the qproperty.h include from
qobject.h.
[ChangeLog][Potentially Source-Incompatible Changes] The qobject.h
header no longer implicitly includes qproperty.h. If your code depends
on the transitive include, explicitly include <QProperty> where
needed.
Task-number: QTBUG-97601
Pick-to: 6.2
Change-Id: I8d6320f5978e20dfc394d2b1e49f626b99529c37
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/corelib/kernel/qobject.h')
| -rw-r--r-- | src/corelib/kernel/qobject.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index e75cf3217e..8a45e73b0e 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -54,7 +54,7 @@ #include <QtCore/qmetatype.h> #include <QtCore/qobject_impl.h> -#include <QtCore/qproperty.h> +#include <QtCore/qbindingstorage.h> #if __has_include(<chrono>) # include <chrono> @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE -class QBindingStorage; +template <typename T> class QBindable; class QEvent; class QTimerEvent; class QChildEvent; |