Eike Ziller 74d527b295 Merge remote-tracking branch 'origin/15.0' ...

Conflicts:
	src/plugins/qmljseditor/qmljseditordocument.cpp
	src/plugins/qmljseditor/qmllsclient.cpp

Change-Id: I0fce4ae6240a8f14257de8e134bceb6e64ddf4a5

2025-01-02 08:55:58 +01:00

..

imports

Unify copyright string and remove year

2024-09-26 10:47:21 +00:00

modules

Merge remote-tracking branch 'origin/15.0'

2025-01-02 08:55:58 +01:00