diff options
author | Tim Jenssen <tim.jenssen@qt.io> | 2024-04-23 14:36:48 +0200 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@qt.io> | 2024-04-23 16:05:55 +0200 |
commit | ef0ee52bf92739bc5b32d70c01ff1eadd752d813 (patch) | |
tree | 0f3b2f546af088b86f21452622d77be43386cd5f /src/libs/qmljs/qmljsstaticanalysismessage.cpp | |
parent | d9c8590c5fd10b1feceb389c142ec244909739a2 (diff) | |
parent | 7dfa7469207f899e347dc6f2bf0c3011140a9b23 (diff) |
Merge remote-tracking branch 'origin/qds/dev'
Conflicts:
doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
doc/qtcreator/src/qtquick/qtquick-live-preview-devices.qdoc
doc/qtcreator/src/qtquick/qtquick-profiler.qdoc
src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
src/plugins/remotelinux/linuxdevicetester.cpp
Change-Id: I3683c1799df05209d05413383456b285a2daf96e
Diffstat (limited to 'src/libs/qmljs/qmljsstaticanalysismessage.cpp')
-rw-r--r-- | src/libs/qmljs/qmljsstaticanalysismessage.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libs/qmljs/qmljsstaticanalysismessage.cpp b/src/libs/qmljs/qmljsstaticanalysismessage.cpp index 5b15e69428..432b97aba7 100644 --- a/src/libs/qmljs/qmljsstaticanalysismessage.cpp +++ b/src/libs/qmljs/qmljsstaticanalysismessage.cpp @@ -189,8 +189,9 @@ StaticAnalysisMessages::StaticAnalysisMessages() Tr::tr("Maximum string value length is %1."), 1); newMsg(ErrInvalidArrayValueLength, Error, Tr::tr("%1 elements expected in array value."), 1); - newMsg(WarnImperativeCodeNotEditableInVisualDesigner, Warning, - Tr::tr("Imperative code is not supported in Qt Design Studio.")); + newMsg(WarnImperativeCodeNotEditableInVisualDesigner, + Warning, + Tr::tr("JavaScript can break the visual tooling in Qt Design Studio.")); newMsg(WarnUnsupportedTypeInVisualDesigner, Warning, Tr::tr("This type (%1) is not supported in Qt Design Studio."), 1); newMsg(WarnReferenceToParentItemNotSupportedByVisualDesigner, Warning, |