diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-06 01:00:11 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-02-06 08:41:57 +0100 |
| commit | 7d86b35dc6833057cae86d9a70e8f2c598c68db5 (patch) | |
| tree | c5b3e87bd0edef2d74bc16b5aba6cbb6b298cd81 /src/qml/types | |
| parent | 4975a33ba9aa357ba2bca93e292b1fbcfb34c24e (diff) | |
| parent | 4e15f2135cdbefd9999a17d4e4fff5ea93679fac (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
src/qml/types/qqmlbind.cpp
src/quick/items/qquicklistview.cpp
tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
Change-Id: Id6805c13256ad13d5651011e5dd09bba0ec02987
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmlbind.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/qml/types/qqmlbind.cpp b/src/qml/types/qqmlbind.cpp index 64c135b392..6d6553259e 100644 --- a/src/qml/types/qqmlbind.cpp +++ b/src/qml/types/qqmlbind.cpp @@ -486,9 +486,10 @@ void QQmlBind::eval() qmlWarning(this) << "Not restoring previous value because restoreMode has not been set.\n" << "This behavior is deprecated.\n" - << "You have to import QtQml 2.15 and set the restoreMode of the binding to fix this warning.\n" + << "You have to import QtQml 2.15 after any QtQuick imports and set\n" + << "the restoreMode of the binding to fix this warning.\n" << "In Qt < 6.0 the default is Binding.RestoreBinding.\n" - << "In Qt >= 6.0 the default is Binding.RestoreBindingOrValue.\n"; + << "In Qt >= 6.0 the default is Binding.RestoreBindingOrValue."; } } else if (d->prevIsVariant) { if (d->restoreValue) { @@ -498,7 +499,8 @@ void QQmlBind::eval() qmlWarning(this) << "Not restoring previous value because restoreMode has not been set.\n" << "This behavior is deprecated.\n" - << "You have to import QtQml 2.15 and set the restoreMode of the binding to fix this warning.\n" + << "You have to import QtQml 2.15 after any QtQuick imports and set\n" + << "the restoreMode of the binding to fix this warning.\n" << "In Qt < 6.0 the default is Binding.RestoreBinding.\n" << "In Qt >= 6.0 the default is Binding.RestoreBindingOrValue.\n"; } |