diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-25 23:35:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-25 23:35:34 +0100 |
| commit | cc1c3d0e2be6dfea6befebdc5f25e519e3fe79b2 (patch) | |
| tree | f160486b34c9157f42e12b23f2e0a3dd9aa2ef1b /src/qml/qml/qqmlnotifier_p.h | |
| parent | 7fa08472d32055a3d6e8b775b843f38ef65e9ce6 (diff) | |
| parent | 4fae8ff1e73eeb48734b28a9c846fbdff1c2ffe1 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Conflicts:
src/qml/compiler/qv4ssa.cpp
src/qml/qml/v8/qqmlbuiltinfunctions.cpp
src/quick/util/qquickprofiler_p.h
Change-Id: I11a89c2a166115d6697adfba09928805643e709e
Diffstat (limited to 'src/qml/qml/qqmlnotifier_p.h')
| -rw-r--r-- | src/qml/qml/qqmlnotifier_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlnotifier_p.h b/src/qml/qml/qqmlnotifier_p.h index eff9684558..14024c0113 100644 --- a/src/qml/qml/qqmlnotifier_p.h +++ b/src/qml/qml/qqmlnotifier_p.h @@ -65,6 +65,8 @@ public: inline ~QQmlNotifier(); inline void notify(); + static void notify(QQmlData *ddata, int notifierIndex); + private: friend class QQmlData; friend class QQmlNotifierEndpoint; |