diff options
| author | Tim Jenssen <[email protected]> | 2023-10-05 15:01:35 +0200 |
|---|---|---|
| committer | Tim Jenssen <[email protected]> | 2023-10-05 15:53:42 +0200 |
| commit | 85ea2758ac063174c8d62b51dbfbfee9291d65c4 (patch) | |
| tree | 33427a0cf8858ec82bb6a1c4aed05e8a4b85660f /src/libs/qmljs/qmljscheck.cpp | |
| parent | 257af1ebd80e0c0b9ac2e4104c6aea5c4d9e6281 (diff) | |
| parent | 97ca8cc2700fb606fdcc1e3f089e904e6d308aba (diff) | |
Merge remote-tracking branch 'origin/qds/dev' into 12.0
Conflicts:
share/qtcreator/qmldesigner/connectionseditor/SuggestionPopup.qml
share/qtcreator/themes/dark.creatortheme
share/qtcreator/themes/default.creatortheme
share/qtcreator/themes/flat-dark.creatortheme
share/qtcreator/themes/flat-light.creatortheme
share/qtcreator/themes/flat.creatortheme
src/libs/utils/CMakeLists.txt
src/plugins/CMakeLists.txt
src/plugins/qmlprojectmanager/qmlproject.cpp
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
Change-Id: Idd87c281e1aa7b7fd2702473ad55e18563cbfb21
Diffstat (limited to 'src/libs/qmljs/qmljscheck.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljscheck.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index e9faed95abb..7ceff0e78de 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -1377,7 +1377,11 @@ bool Check::visit(BinaryExpression *ast) SourceLocation expressionSourceLocation = locationFromRange(ast->firstSourceLocation(), ast->lastSourceLocation()); - if (expressionAffectsVisualAspects(ast)) + + const bool isDirectInConnectionsScope = (!m_typeStack.isEmpty() + && m_typeStack.last() == "Connections"); + + if (expressionAffectsVisualAspects(ast) && !isDirectInConnectionsScope) addMessage(WarnImperativeCodeNotEditableInVisualDesigner, expressionSourceLocation); // check ==, != |