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

Merge remote-tracking branch 'origin/14.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: If39fe80197537c489361810e91ee221c6c52ea01
This commit is contained in:
Eike Ziller
2024-07-01 12:01:27 +02:00
parent af4da1277d 4125bc94d1
commit 0283b81392
112 changed files with 378 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmljseditor/QmlJSEditor.json.in
View File

@@ -13,7 +13,7 @@
"Alternatively, this plugin may be used under the terms of the GNU General Public License version 3 as published by the Free Software Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT included in the packaging of this plugin. Please review the following information to ensure the GNU General Public License requirements will be met: https://www.gnu.org/licenses/gpl-3.0.html."
],
"Category" : "Qt Quick",
"Description" : "Edit QML and JavaScript files",
"Description" : "Edit QML and JavaScript files.",
"LongDescription" : [],
"Url" : "https://www.qt.io",
${IDE_PLUGIN_DEPENDENCIES}