diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-08-17 14:38:39 +0200 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-08-17 13:17:43 +0000 |
| commit | 9da1c453324bf923bb9d3e79da6540b99a9973f5 (patch) | |
| tree | 572e9d1296ae6d1279b67ccab5f752cae85aa6fa /src/qml/util | |
| parent | 607ced5bfd1390de4342bb44ab99e7acafd9f4e9 (diff) | |
QQmlAdaptorModel: include qqmlglobal_p.h in header file
In other places where qqmladaptormodel_p.h is included, there are lots
of other includes which eventually result in qqmlglobal_p.h being seen.
In the new qqmldelegatecomponent.cpp, there aren't so many, so this
missing dependency became clear, at least on Windows:
c:\users\qt\work\qt\qtdeclarative\include\qtqml\5.12.0\qtqml\private\../../../../../src/qml/qml/qqmlguard_p.h(119): error C3861: 'QQml_setParent_noEvent': identifier not found
c:\users\qt\work\qt\qtdeclarative\include\qtqml\5.12.0\qtqml\private\../../../../../src/qml/qml/qqmlguard_p.h(113): note: while compiling class template member function 'void TestNamespace::QQmlStrongJSQObjectReference<TestNamespace::QObject>::setObject(T *,TestNamespace::QObject *)'
c:\users\qt\work\qt\qtdeclarative\include\qtqml\5.12.0\qtqml\private\../../../../../src/qml/util/qqmladaptormodel_p.h(72): note: see reference to class template instantiation 'TestNamespace::QQmlStrongJSQObjectReference<TestNamespace::QObject>' being compiled
c:\users\qt\work\qt\qtdeclarative\include\qtqml\5.12.0\qtqml\private\../../../../../src/qml/qml/qqmlguard_p.h(125): error C3861: 'QQml_setParent_noEvent': identifier not found
The error was because QQml_setParent_noEvent(QObject*, QObject*) was
not defined, but it is defined inline in qqmlglobal_p.h.
Change-Id: I972e2795d5a705e1170ef50b2ef7f9b124a28472
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'src/qml/util')
| -rw-r--r-- | src/qml/util/qqmladaptormodel_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/util/qqmladaptormodel_p.h b/src/qml/util/qqmladaptormodel_p.h index b834704163..b5e0881078 100644 --- a/src/qml/util/qqmladaptormodel_p.h +++ b/src/qml/util/qqmladaptormodel_p.h @@ -54,7 +54,7 @@ #include <QtCore/qabstractitemmodel.h> #include "private/qqmllistaccessor_p.h" - +#include <private/qqmlglobal_p.h> #include <private/qqmlguard_p.h> #include <private/qqmlnullablevalue_p.h> |