From 0a3d09ada5da2e97bc3c3b0118ab2686ccda8f48 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 11 Apr 2025 15:32:16 +0200 Subject: [PATCH 1/3] Bump version to 16.0.2 Change-Id: I2ec15eaf8620efb625561dbd3047ed48f8dce453 Reviewed-by: Eike Ziller --- cmake/QtCreatorIDEBranding.cmake | 4 ++-- qbs/modules/qtc/qtc.qbs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index 893bb758fa2..dc8212bd543 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,6 +1,6 @@ -set(IDE_VERSION "16.0.1") # The IDE version. +set(IDE_VERSION "16.0.2") # The IDE version. set(IDE_VERSION_COMPAT "16.0.0") # The IDE Compatibility version. -set(IDE_VERSION_DISPLAY "16.0.1") # The IDE display version. +set(IDE_VERSION_DISPLAY "16.0.2") # The IDE display version. set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. set(IDE_DISPLAY_NAME "Qt Creator") # The IDE display name. diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 8519fe2a84f..9f4fdf2c26c 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -4,10 +4,10 @@ import qbs.FileInfo import qbs.Utilities Module { - property string qtcreator_display_version: '16.0.1' + property string qtcreator_display_version: '16.0.2' property string ide_version_major: '16' property string ide_version_minor: '0' - property string ide_version_release: '1' + property string ide_version_release: '2' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release From c979b59b0d564e7b3f0f7586fcadfc14093e998f Mon Sep 17 00:00:00 2001 From: Krzysztof Chrusciel Date: Fri, 11 Apr 2025 09:34:47 +0200 Subject: [PATCH 2/3] AI Assistant: qdoc models 7B and 14B for qml Change-Id: Id201db8276bd4ab406d604dea4d8845e30548e10 Reviewed-by: Leena Miettinen --- .../src/editors/creator-only/creator-aiassistant.qdoc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/qtcreator/src/editors/creator-only/creator-aiassistant.qdoc b/doc/qtcreator/src/editors/creator-only/creator-aiassistant.qdoc index 94c7c01d372..bebc8a96681 100644 --- a/doc/qtcreator/src/editors/creator-only/creator-aiassistant.qdoc +++ b/doc/qtcreator/src/editors/creator-only/creator-aiassistant.qdoc @@ -78,6 +78,8 @@ \li \c codellama:7b-code \li \c deepseek-coder-v2:lite \li \c starcoder2:7b + \li \c theqtcompany/codellama-7b-qml + \li \c theqtcompany/codellama-13b-qml \endlist \section2 Custom models @@ -86,6 +88,7 @@ You can use the following custom models: \list + \li \l {https://huggingface.co/QtGroup/CodeLlama-7B-QML}{codellama:7b-code-qml} \li \l {https://huggingface.co/QtGroup/CodeLlama-13B-QML}{codellama:13b-code-qml} \endlist @@ -98,8 +101,6 @@ of your choice) \li Meta Code Llama 13B (for Qt 5, running in a cloud deployment of your choice) - \li Meta Code Llama 13B QML through Ollama (running locally on your - computer) \li Meta Llama 3.3 70B QML (running in a cloud deployment of your choice) \li Anthropic Claude 3.5 Sonnet (provided by Anthropic, remember that you need to have a token-based billing payment method configured for your @@ -107,7 +108,10 @@ \li OpenAI GPT-4o (provided by OpenAI, remember that you need to have a token-based billing payment method configured for your OpenAI account: \l {https://platform.openai.com/}{platform.openai.com}) + \li Meta Code Llama 13B QML through Ollama (running locally on your computer) + \li Meta Code Llama 7B QML through Ollama (running locally on your computer) \li Meta Code Llama 7B through Ollama (running locally on your computer) + \li DeepSeek Coder V2 Lite through Ollama (running locally on your computer) \li BigCode StarCoder2 through Ollama (running locally on your computer) \endlist From 664bfdea57add653d4fd12d96f3fcd640fbb883a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Brooke?= Date: Tue, 15 Apr 2025 10:07:05 +0200 Subject: [PATCH 3/3] French translation: fix the "Swap Views" translation The current one makes no sense at all. Change-Id: Iba3b632f25f2bb5d71a9cd582e74be43f5e0d06b Reviewed-by: Orgad Shaneh Reviewed-by: Alexandre Laurent Reviewed-by: Olivier Delaune --- share/qtcreator/translations/qtcreator_fr.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index d07792bb693..d453cc16deb 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -59705,7 +59705,7 @@ Influence l’indentation des lignes de continuation. Swap Views - Afficher les vues + Intervertir les vues JSON Editor