diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-17 09:20:35 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-17 12:59:31 +0100 |
| commit | 749e37efc5dd9eaa693c4f86253c48c37737aa09 (patch) | |
| tree | 9a03ab4fbf968cbe8489617941b80a113f4afdb2 /src/corelib/kernel/qproperty.h | |
| parent | 0dcdfc1ee4238afc075a249e0ec5b8b198681fda (diff) | |
Property binding system: Fix developer build with MSVC 2019 (16.4.1)
- Fix wrong forward declaration
- De-inline constructor of QUntypedPropertyBinding(), fixing:
qtbase\include/src/corelib/tools/qshareddata.h(184): error C2027: use of undefined type 'QPropertyBindingPrivate'
qtbase\include/src/corelib/kernel/qpropertyprivate.h(60): note: see declaration of 'QPropertyBindingPrivate'
qtbase\include/src/corelib/tools/qshareddata.h(184): note: while compiling class template member function 'QExplicitlySharedDataPointer<QPropertyBindingPrivate>::~QExplicitlySharedDataPointer(void)'
qtbase\src\corelib\kernel\qproperty.h(143): note: see reference to function template instantiation 'QExplicitlySharedDataPointer<QPropertyBindingPrivate>::~QExplicitlySharedDataPointer(void)' being compiled
qtbase\src\corelib\kernel\qproperty.h(142): note: see reference to class template instantiation 'QExplicitlySharedDataPointer<QPropertyBindingPrivate>' being compiled
qtbase\include\/src/corelib/tools/qshareddata.h(184): warning C4150: deletion of pointer to incomplete type 'QPropertyBindingPrivate'; no destructor called
qtbase\include\/src/corelib/kernel/qpropertyprivate.h(60): note: see declaration of 'QPropertyBindingPrivate'
Amends 9f9049b486a47aef0c7e2e3852b20aa4ffdce748.
Change-Id: Idd613e2487d5ab7f8ead74747acd976d5d210c28
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/corelib/kernel/qproperty.h')
| -rw-r--r-- | src/corelib/kernel/qproperty.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h index 45acfadd50..60e4193827 100644 --- a/src/corelib/kernel/qproperty.h +++ b/src/corelib/kernel/qproperty.h @@ -122,7 +122,7 @@ public: // already has. using BindingEvaluationFunction = std::function<BindingEvaluationResult(int version, void *propertyStoragePtr)>; - QUntypedPropertyBinding() = default; + QUntypedPropertyBinding(); QUntypedPropertyBinding(BindingEvaluationFunction function, const QPropertyBindingSourceLocation &location); QUntypedPropertyBinding(QUntypedPropertyBinding &&other); QUntypedPropertyBinding(const QUntypedPropertyBinding &other); @@ -337,7 +337,7 @@ private: Q_DISABLE_COPY(QProperty) friend struct QPropertyBasePointer; - friend struct QPropertyBinding<T>; + friend class QPropertyBinding<T>; friend struct QPropertyObserver; // Mutable because querying for the value may require evalating the binding expression, calling // non-const functions on QPropertyBase. |