diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-10-07 13:10:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-10-07 13:10:18 +0200 |
| commit | 7e17fb2ded407cd75643f248d39a21721cfd79f7 (patch) | |
| tree | ce24e8e7a94d5bc74566086b61c4164236e468ad /src/qml/types/qqmlbind.cpp | |
| parent | f3d40bd0203acda21abfb3c3c71e526646706616 (diff) | |
| parent | 67fc5b677a05f88f043ea825810b7b244a516b42 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp
Change-Id: Id2e81000bcbd4de18fe22b085fdf5eed42c02516
Diffstat (limited to 'src/qml/types/qqmlbind.cpp')
| -rw-r--r-- | src/qml/types/qqmlbind.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/types/qqmlbind.cpp b/src/qml/types/qqmlbind.cpp index 861243987f..9d305cd24c 100644 --- a/src/qml/types/qqmlbind.cpp +++ b/src/qml/types/qqmlbind.cpp @@ -382,10 +382,10 @@ QQmlBind::RestorationMode QQmlBind::restoreMode() const void QQmlBind::setRestoreMode(RestorationMode newMode) { Q_D(QQmlBind); + d->restoreModeExplicit = true; if (newMode != restoreMode()) { d->restoreValue = (newMode & RestoreValue); d->restoreBinding = (newMode & RestoreBinding); - d->restoreModeExplicit = true; emit restoreModeChanged(); } } |