delta/qt-creator.git/src/plugins/texteditor/codestyleselectorwidget.cpp, branch 10.0 code.qt.io: qt-creator/qt-creator.git Some fixes in translated strings 2023-02-15T12:45:48+00:00 Eike Ziller eike.ziller@qt.io 2023-02-14T15:14:08+00:00 379bf65e966f257175bb37122d333623d830d91e - doesn't make sense to translate "%1" - showPreprocessedFile: "reason" contains full stop, put at the end - add missing closing > - remove whitespace at the end of translated string - added missing quotes and full stops - Remove some control text from tr Change-Id: I5537c3d12d038e25e2209af1198129fbf959b43c Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> 
- doesn't make sense to translate "%1"
- showPreprocessedFile: "reason" contains full stop, put at the end
- add missing closing >
- remove whitespace at the end of translated string
- added missing quotes and full stops
- Remove some control text from tr

Change-Id: I5537c3d12d038e25e2209af1198129fbf959b43c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Merge remote-tracking branch 'origin/9.0' into 10.0 2023-02-10T09:29:14+00:00 Eike Ziller eike.ziller@qt.io 2023-02-10T09:29:14+00:00 b29cb4efe1116492deda8babf028d8c71cd01730 Conflicts: src/plugins/texteditor/codestyleselectorwidget.cpp src/plugins/updateinfo/updateinfoplugin.cpp Change-Id: Iac33b852ccef6018bd81188716526aa70c3f5a2d 
 Conflicts:
	src/plugins/texteditor/codestyleselectorwidget.cpp
	src/plugins/updateinfo/updateinfoplugin.cpp

Change-Id: Iac33b852ccef6018bd81188716526aa70c3f5a2d
Editors: Fix message box when opening broken code style file 2023-02-08T08:06:02+00:00 Eike Ziller eike.ziller@qt.io 2023-02-06T14:46:56+00:00 5728f09facdaa4c2e358221f3b9ca66f8651c049 The file name is not supposed to be the button label. Fixes: QTCREATORBUG-28746 Change-Id: I45ee2a860da8f7ffefc6d72c0d85b7f6a261489c Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> 
The file name is not supposed to be the button label.

Fixes: QTCREATORBUG-28746
Change-Id: I45ee2a860da8f7ffefc6d72c0d85b7f6a261489c
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
TextEditor: Tr::tr 2023-01-18T07:02:12+00:00 hjk hjk@qt.io 2023-01-17T17:02:43+00:00 17b20e06224f1fdee61fe5477b0789d09d602652 Change-Id: I28aa68e25c53c3a4d1c370074d7b3318944dc45a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> 
Change-Id: I28aa68e25c53c3a4d1c370074d7b3318944dc45a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Remove GPL-3.0+ from license identifiers 2023-01-06T11:15:13+00:00 Kai Köhne kai.koehne@qt.io 2022-12-21T09:12:09+00:00 56baf8c058792187b574cf988fcf4b313f527156 Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0, this applies only to a hypothetical newer version of GPL, that doesn't exist yet. If such a version emerges, we can still decide to relicense... While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only Change was done by running find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \; Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b Reviewed-by: Eike Ziller <eike.ziller@qt.io> 
Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0,
this applies only to a hypothetical newer version of GPL, that doesn't
exist yet. If such a version emerges, we can still decide to relicense...

While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only

Change was done by running

  find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \;

Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Remove unused includes of QBoxLayout 2022-11-18T15:29:29+00:00 Jarek Kobus jaroslaw.kobus@qt.io 2022-11-18T07:52:50+00:00 02f384115e615b836d70c284095153d89738fc8e Change-Id: I74204eaf70dbcb31a8bd13609bef35459c8c6b5f Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io> 
Change-Id: I74204eaf70dbcb31a8bd13609bef35459c8c6b5f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
Use SPDX license identifiers 2022-08-26T12:27:18+00:00 Lucie Gérard lucie.gerard@qt.io 2022-08-19T13:59:36+00:00 a7956df3ca45579c62b496621a7d3b55d73c98b8 Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io> 
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
CodeStyle: Remove edit pop-up 2022-08-16T11:49:19+00:00 Artem Sokolovskii artem.sokolovskii@qt.io 2022-08-01T15:28:42+00:00 74ac09346f54e67a027b514c1c7c12c59c30e540 Removed the Edit pop-up on the CodeStyle page. Now editing is available immediately after opening CodeStyle tab. I left a preview on the project CodeStyle page and added a link to global settings. ToDo: In project CodeStyle page replace preview with CodeStyleEditor. I'm not 100% sure that it is needed. If you have some thoughts please write a comment. Change-Id: I31032a97b9668b4f6b06fc6c5c704700fb44ee4f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> 
Removed the Edit pop-up on the CodeStyle page.
Now editing is available immediately after opening
CodeStyle tab.
I left a preview on the project CodeStyle page and
added a link to global settings.

ToDo:
In project CodeStyle page replace preview with CodeStyleEditor.
I'm not 100% sure that it is needed. If you have some thoughts
please write a comment.

Change-Id: I31032a97b9668b4f6b06fc6c5c704700fb44ee4f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Utils: Make the second parameter to LayoutBuilder::attach() an enum 2022-07-26T11:52:16+00:00 hjk hjk@qt.io 2022-07-26T09:35:19+00:00 b97c495d2be36915bf54da246f297e7d788a0f84 More explicit and more potential options (e.g. "treat grid as form") than a bool. Change-Id: I89413efe30410160c38b0e524ba64288dde2332e Reviewed-by: Eike Ziller <eike.ziller@qt.io> 
More explicit and more potential options (e.g. "treat grid as form")
than a bool.

Change-Id: I89413efe30410160c38b0e524ba64288dde2332e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
TextEditor: inline codestyleselectorwidget.ui 2022-07-25T15:49:34+00:00 hjk hjk@qt.io 2022-07-25T14:27:34+00:00 23075ca2f0be6b15379c5e6254496e456c879d52 Change-Id: Id545fbee532e463fa41cdc4f8dfc2b9bcd807186 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> 
Change-Id: Id545fbee532e463fa41cdc4f8dfc2b9bcd807186
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>