aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlnotifier.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-28 12:16:17 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-11-28 12:16:17 +0000
commit4e1463c20aa6ec52f23e1e5f6426b68edb2255f0 (patch)
treedf3d8f65f0c8df1990c48931c4c0b5063ff6f8c6 /src/qml/qml/qqmlnotifier.cpp
parentea9d6955f4c1c1141d0909ddb32abb59c032ac3c (diff)
parent9044800083ccffe4d0b732f8b3b60512f32d8f8a (diff)
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'src/qml/qml/qqmlnotifier.cpp')
-rw-r--r--src/qml/qml/qqmlnotifier.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlnotifier.cpp b/src/qml/qml/qqmlnotifier.cpp
index 19f03eae80..185f9687fb 100644
--- a/src/qml/qml/qqmlnotifier.cpp
+++ b/src/qml/qml/qqmlnotifier.cpp
@@ -71,6 +71,12 @@ namespace {
};
}
+void QQmlNotifier::notify(QQmlData *ddata, int notifierIndex)
+{
+ if (QQmlNotifierEndpoint *ep = ddata->notify(notifierIndex))
+ emitNotify(ep, Q_NULLPTR);
+}
+
void QQmlNotifier::emitNotify(QQmlNotifierEndpoint *endpoint, void **a)
{
QVarLengthArray<NotifyListTraversalData> stack;