diff options
author | Lars Knoll <lars.knoll@qt.io> | 2017-04-30 10:44:29 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2017-05-02 08:40:48 +0200 |
commit | c3e1e6390edbc28e6e528f401eb4f3639661302b (patch) | |
tree | 5c882bfe7fced9b357e80a6b56ccdc88de8a41c3 /src/qml/types | |
parent | 9709d04ba7787c853a1ddbeed0347eab27c0924f (diff) | |
parent | 6a2febc680e163e56eb61d322d156dbf6fb07e0e (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I71275a2076c3d32ee2896571be882067320a2e9e
Diffstat (limited to 'src/qml/types')
-rw-r--r-- | src/qml/types/qqmlbind.cpp | 2 | ||||
-rw-r--r-- | src/qml/types/qqmlconnections.cpp | 2 | ||||
-rw-r--r-- | src/qml/types/qqmldelegatemodel.cpp | 2 | ||||
-rw-r--r-- | src/qml/types/qqmllistmodel.cpp | 2 | ||||
-rw-r--r-- | src/qml/types/qqmllistmodelworkeragent.cpp | 1 | ||||
-rw-r--r-- | src/qml/types/qqmlmodelindexvaluetype.cpp | 2 | ||||
-rw-r--r-- | src/qml/types/qqmlobjectmodel.cpp | 2 | ||||
-rw-r--r-- | src/qml/types/qqmltimer.cpp | 2 | ||||
-rw-r--r-- | src/qml/types/qquickpackage.cpp | 2 | ||||
-rw-r--r-- | src/qml/types/qquickworkerscript.cpp | 1 |
10 files changed, 18 insertions, 0 deletions
diff --git a/src/qml/types/qqmlbind.cpp b/src/qml/types/qqmlbind.cpp index 2ded9c13c8..da644becc2 100644 --- a/src/qml/types/qqmlbind.cpp +++ b/src/qml/types/qqmlbind.cpp @@ -386,3 +386,5 @@ void QQmlBind::eval() } QT_END_NAMESPACE + +#include "moc_qqmlbind_p.cpp" diff --git a/src/qml/types/qqmlconnections.cpp b/src/qml/types/qqmlconnections.cpp index 66bc772279..6e9cb5f1fe 100644 --- a/src/qml/types/qqmlconnections.cpp +++ b/src/qml/types/qqmlconnections.cpp @@ -313,3 +313,5 @@ void QQmlConnections::componentComplete() } QT_END_NAMESPACE + +#include "moc_qqmlconnections_p.cpp" diff --git a/src/qml/types/qqmldelegatemodel.cpp b/src/qml/types/qqmldelegatemodel.cpp index f26e5f6cdb..8f4b9cd519 100644 --- a/src/qml/types/qqmldelegatemodel.cpp +++ b/src/qml/types/qqmldelegatemodel.cpp @@ -3346,3 +3346,5 @@ QV4::ReturnedValue QQmlDelegateModelEngineData::array(QV8Engine *engine, const Q } QT_END_NAMESPACE + +#include "moc_qqmldelegatemodel_p.cpp" diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp index efc2828dc5..06caa77bb4 100644 --- a/src/qml/types/qqmllistmodel.cpp +++ b/src/qml/types/qqmllistmodel.cpp @@ -2606,3 +2606,5 @@ bool QQmlListModelParser::definesEmptyList(const QString &s) */ QT_END_NAMESPACE + +#include "moc_qqmllistmodel_p.cpp" diff --git a/src/qml/types/qqmllistmodelworkeragent.cpp b/src/qml/types/qqmllistmodelworkeragent.cpp index 963459cc55..0a5adbf292 100644 --- a/src/qml/types/qqmllistmodelworkeragent.cpp +++ b/src/qml/types/qqmllistmodelworkeragent.cpp @@ -253,3 +253,4 @@ bool QQmlListModelWorkerAgent::event(QEvent *e) QT_END_NAMESPACE +#include "moc_qqmllistmodelworkeragent_p.cpp" diff --git a/src/qml/types/qqmlmodelindexvaluetype.cpp b/src/qml/types/qqmlmodelindexvaluetype.cpp index 0b05210ce5..cbf2fef348 100644 --- a/src/qml/types/qqmlmodelindexvaluetype.cpp +++ b/src/qml/types/qqmlmodelindexvaluetype.cpp @@ -64,3 +64,5 @@ QString QQmlItemSelectionRangeValueType::toString() const } QT_END_NAMESPACE + +#include "moc_qqmlmodelindexvaluetype_p.cpp" diff --git a/src/qml/types/qqmlobjectmodel.cpp b/src/qml/types/qqmlobjectmodel.cpp index d926ecb6ce..2814b9d38f 100644 --- a/src/qml/types/qqmlobjectmodel.cpp +++ b/src/qml/types/qqmlobjectmodel.cpp @@ -439,3 +439,5 @@ void QQmlObjectModel::clear() } QT_END_NAMESPACE + +#include "moc_qqmlobjectmodel_p.cpp" diff --git a/src/qml/types/qqmltimer.cpp b/src/qml/types/qqmltimer.cpp index 7efdac4c22..2037c4f6cd 100644 --- a/src/qml/types/qqmltimer.cpp +++ b/src/qml/types/qqmltimer.cpp @@ -355,3 +355,5 @@ void QQmlTimerPrivate::animationFinished(QAbstractAnimationJob *) } QT_END_NAMESPACE + +#include "moc_qqmltimer_p.cpp" diff --git a/src/qml/types/qquickpackage.cpp b/src/qml/types/qquickpackage.cpp index 17eff5ac40..e0d1888f33 100644 --- a/src/qml/types/qquickpackage.cpp +++ b/src/qml/types/qquickpackage.cpp @@ -194,3 +194,5 @@ QQuickPackageAttached *QQuickPackage::qmlAttachedProperties(QObject *o) QT_END_NAMESPACE + +#include "moc_qquickpackage_p.cpp" diff --git a/src/qml/types/qquickworkerscript.cpp b/src/qml/types/qquickworkerscript.cpp index f35e17c34d..6159355afc 100644 --- a/src/qml/types/qquickworkerscript.cpp +++ b/src/qml/types/qquickworkerscript.cpp @@ -758,3 +758,4 @@ QT_END_NAMESPACE #include <qquickworkerscript.moc> +#include "moc_qquickworkerscript_p.cpp" |