feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/qds/dev' into 12.0

Browse Source 
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
This commit is contained in:
Tim Jenssen
2023-10-05 15:01:35 +02:00
parent 257af1ebd8 97ca8cc270
commit 85ea2758ac
329 changed files with 14186 additions and 5756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/qmljs/qmljscheck.cpp
View File

@@ -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 ==, !=