Commit Graph

68765 Commits

Author SHA1 Message Date
Eike Ziller
0f9b118776 Merge remote-tracking branch 'origin/11.0'
Change-Id: Ib798dc9922c01b7667388ca03d3a248610f73028
2023-06-20 10:36:06 +02:00
David Schulz
deaef7da33 ClangTools: make parsing diagnostics cancelable
Change-Id: Ia5b4bd6f5fbb9a81888b1eaf11b956617e4b740c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-06-20 08:26:14 +00:00
Eike Ziller
f97d9e51c0 CMake: Use QtC temporary dir for staging directory for local builds
For builds on the local host, use the Qt Creator temporary directory as
the default "staging" directory. This is a "nicer" directory on Windows
and is also cleared automatically (at Qt Creator shutdown), which is not
true for "/tmp".

Amends 4753b658bb

Change-Id: Ia6dc0d76fb2d97eb7ec931981df057ec83553e69
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-06-20 08:23:09 +00:00
The Qt Project
875bd3bf96 Merge "Merge remote-tracking branch 'origin/10.0' into 11.0" into 11.0 2023-06-20 08:22:21 +00:00
Christian Kandeler
7b8117ba2f TextEditor: Add dedicated text style for C++ concepts
Fixes: QTCREATORBUG-29286
Change-Id: Ifc89bad0b84dfdbcac0720fc59799edd461c00bb
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-20 08:15:50 +00:00
Eike Ziller
3a57a1a291 Merge remote-tracking branch 'origin/10.0' into 11.0
Change-Id: I909bf27bd6d43eb74ae61b15a61467a4a7e0558e
2023-06-20 10:12:59 +02:00
hjk
125e345e2e Utils: Make a lot of labels mouse-selectable
Change-Id: I2c17cfeeab9fb9e15d15902ecd1f6c8921dc1464
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-20 08:01:50 +00:00
Jarek Kobus
3e074a52c1 PluginInstallWizard: Reuse TaskTree
Change-Id: I0e139627a9d4c3401bcf7727ef1e51b2de858b77
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-20 07:19:21 +00:00
Marcus Tillmanns
6c34e1937c Utils: Fix operator escaping
Stops CommandLine / ProcessArgs from escaping
operators '&&', '||' and ';'.

Fixes: QTCREATORBUG-29280
Change-Id: Idf4f429fec0d96b67266761297eea851c283ac4c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-20 06:23:37 +00:00
Marcus Tillmanns
8aff1dfd85 Copilot: Add Tooltip to links
Change-Id: I24a74272e58658fa607779e73baa7ada56bf085e
Reviewed-by: hjk <hjk@qt.io>
2023-06-20 05:57:03 +00:00
David Schulz
2ad12b5b2c ClangTools: optimize generating diagnostic text marks
If we already know the document for a TextMark we are saving a
potentially expensive lookup.

Change-Id: Ib42b9ab5f36492a94846ef819c84c69a5aecf2e4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-20 05:41:44 +00:00
hjk
1193473f46 Copilot: Make some settings help text mouse-selectable
Change-Id: Ibb855bf94aeb5f83220da049b32e26400dacc0e8
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-06-19 15:40:48 +00:00
Leena Miettinen
0814677b4c Autotest: Fix UI text capitalization and punctuation
Change-Id: I7ca8adec90ad93c9724126b170dcea895266e38c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-19 12:31:08 +00:00
Leena Miettinen
b21f0c779b MCU: Fine-tune UI text
Change-Id: Ia03f10891a6bc6af96d8a6165dd6bbe989131e4f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-19 12:10:11 +00:00
Leena Miettinen
1fe2b3e583 Valgrind: Write Valgrind with initial capital letter
Change-Id: I219b0e752d32856f7fb56bc7df2883fc8749ae09
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-19 11:53:20 +00:00
Christian Kandeler
5203704e24 qbs build: Mark some more tools as non-Qt
Plus small clean-ups.

Change-Id: I3601543b04bfc7b016769a63091a91f62607f2dc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-19 11:26:56 +00:00
Christian Kandeler
32e6b4d66d CppEditor: Improve createContentProposal()
- Limit iterator scope
- Replace if-else chain with early continue
- Save an unneeded look-up

Change-Id: If90f726ddb21a516ed3d438379382a2e4cd248a9
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-19 11:26:26 +00:00
Leena Miettinen
6c8913e229 ADS: Fix punctuation in UI text
- Use full stops in end of messages
- Use double quotes for emphasis (instead of single ones)

Change-Id: Ie891dea536f267a12eae5e47c79421b820d0b5ea
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-19 11:22:24 +00:00
Leena Miettinen
c9df4f94a4 Terminal: Fine-tune tooltips
And add full stops to ends of tooltips and messages.

Change-Id: Ieacb17069fc45591089eebb610d4824195adb660
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-06-19 11:06:03 +00:00
Leena Miettinen
942f30d461 Docker: Fix UI text
- Write Docker with an initial capital letter
- Rewrite a tooltip to add reasons for adding a flag first, and
  then the flag.

Change-Id: I8b4f3775ad618999faddec90b62ba7bb11ac23ae
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-19 11:05:45 +00:00
Leena Miettinen
7da84e1734 Python: Use double quotes for emphasis
And write Python with an initial capital letter and UI with
all caps.

Change-Id: I5c7a85aa4ae9e5af1f4cc66e8705db126fbec23b
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-06-19 09:53:51 +00:00
David Schulz
8ea70c5185 CppEditor: Fix crash on proposal creation
The assumption that all items are CppAssistProposalItem is wrong.
Snippets items have been AssistProposalItems, and since
22c72f9999 they are SnippetProposalItems.

Change-Id: Ic483741f6e7eb5382d327702600c88d6ec6e30ed
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-19 09:30:09 +00:00
Leena Miettinen
8e9f34662e Git: Add full stop to end of message
Change-Id: I66b67d2be82812efaf84bd8150e44fd097abe0cf
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-06-19 09:25:15 +00:00
Leena Miettinen
03e1f5ac54 Axivion: Use sentence style capitalization for labels
Even though these are technically rows, they are used as labels
in the UI.

Change-Id: Ic9378cff61c49e7f5ee709d93660d7a55be45558
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-19 09:15:22 +00:00
Leena Miettinen
d81b3c6131 Copilot: Fix UI text capitalization and punctuation
Change-Id: I49a38633a8df1b4d65ee02bebecf270287c800d9
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-06-19 09:05:01 +00:00
Christian Kandeler
021f0108cb qbs build: Do not declare a Qt dependency for the Ctrl-C stub tool
Change-Id: I75f4a1775b7718ee8d38937557be3bf71efade1f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-19 08:43:47 +00:00
David Schulz
8b16e40858 ClangTools: Utilize TaskTree to parse diagnostics from file
This reduces the time the main thread is blocked for reading the diagnostics
from the result file.

Change-Id: If6cc5671c709cb519b651c2b7ce3e8067e0b5f39
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-06-19 08:38:06 +00:00
Eike Ziller
f88db30319 Merge remote-tracking branch 'origin/11.0'
Change-Id: Ibb433d3e1ea2c0632dd2f710c8ec995de7599978
2023-06-19 10:08:56 +02:00
Christian Stenger
d30689c9a9 QtSupport: Fix handling of kits
Allow creation of kits without a Qt.
Broke with ce7677a7d7.

Change-Id: Ia6ab9746beab9f4c48b72930c32d5068bb7c733b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-06-19 06:48:14 +00:00
Eike Ziller
1df36cac5a Fix that run configurations lost their executable
Prevent QmlDesignerProjectManager messing with projects in Qt Creator.

Change-Id: Ife5a9a8c3a80a9aa1b6e1c5526fb1705996b1b3e
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-19 06:33:45 +00:00
David Schulz
5ba10671da CppEditor: fix highlighter tests
amends 9091c99429

Change-Id: Iaa64d51aa0dad1d63c88a51bfa55afa2367e65ed
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-06-16 11:05:00 +00:00
Cristian Adam
db8842a0d4 App: Allow usage of "windows" style if enforced
Currently the code checks if qFuzzyCompare(qApp->devicePixelRatio(),
1.0) and if the condition is true it will always set the "fusion" style.

If the user sets a "-style" option we shouldn't override it.

Change-Id: If9a20a1b38f4a5aa3c2ccaf53cb01aafb45077f9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-16 10:36:58 +00:00
Alessandro Portale
850f1ce66c Android: Don't pass duplicate ANDROID_PLATFORM to CMake
This makes sure that one unique argument "-DANDROID_PLATFORM:STRING=..."
is passed to CMake. An entry in a kit's CMake configuration has the
precedence over the ANDROID_PLATFORM defined by Qt's build system.

Fixes: QTCREATORBUG-29112
Change-Id: I1c4d80be9ddfc7a00a5a7eff476497f08d87b741
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-16 09:30:52 +00:00
Christian Kandeler
118c493c6c CppEditor: Make generated function const, if necessary
... in "Add member function" quickfix.

Fixes: QTCREATORBUG-29274
Change-Id: Ie939389ac2336f70fd216f29ce0d38e495786b3e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-16 09:11:31 +00:00
Cristian Adam
64cd1df74b CMakePM: Add Qt SDK ninja to configure environment
Fixes: QTCREATORBUG-29032
Change-Id: I1aebd11ba85ad6a363ecf1ab6406cdec20753e9d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-06-16 09:10:52 +00:00
Eike Ziller
562c5774e3 Debugger: Fix automatic source mapping for Qt
- The QtVersion::sourcePath() was wrong because QT_INSTALL_PREFIX/src
  doesn't return the right path. Work around by checking if sources are
  found, and otherwise trying the location that we know the installers
  to put them.
- Pass the sourcePath along to the debugger run control, and use that
  instead of looking for qmake in the PATH (which fails because it is
  not in PATH).

Fixes: QTCREATORBUG-28950
Change-Id: Iffa262d6c87dbc979c449d43cd4a85e1320bcd37
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-06-16 07:15:16 +00:00
Miikka Heikkinen
a2b2a2eaa1 QmlDesigner: Copy extra files regardless of the way component is added
ExtraFile property of item library entries was only handled when
item was dragged to navigator. Moved the handling to QmlVisualNode
so it would be done regardless of how the item is created.

Fixes: QDS-10058
Change-Id: Ied0c418a731104cdf727b1e2a0fe15a8e3b6ff5e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-06-16 06:32:01 +00:00
Jarek Kobus
6f6f6d3f97 Solutions: Add a common Solutions page
Add also The Tasking solution page. Add some hints into README.md file.

Change-Id: I4e355c95977d668fbc2f7bd286f9446e4e4b1f69
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-06-15 14:58:42 +00:00
Tim Jenssen
053e970c4d QmlProjectManager: use qml2puppet only if it is QtSudio Qt
Task-number: QTCREATORBUG-29259
Change-Id: Ib05737368c224fa28b2c9f091dfa0e210bc838af
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-15 12:45:36 +00:00
David Schulz
22c72f9999 Editor: postpone snippet completion item tooltip generation
Change-Id: Ib9762b489af87eab976248803dd0e9f4a3e0efba
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-15 12:36:55 +00:00
Christian Kandeler
daf6dfab68 Issues Pane: Do not ignore clicks into second column
The right column typically shows the file name, so it's clearly expected
that clicking it takes you to the location.

Fixes: QTCREATORBUG-29273
Change-Id: I14fbb3392ac34e25a614811d8190f559b19b9088
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-06-15 12:07:11 +00:00
Christian Kandeler
826f015b83 QbsProjectManager: Let users reset the path to qbs
Also, don't store it if it wasn't changed from the default.

Change-Id: Ia0f2e2b7e8f65c1fa32e111be499461fb2dda1d5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-15 12:06:53 +00:00
David Schulz
61de872f0f Editor: ensure valid blocknumbers for overlay prefiltering
Change-Id: Ifc5f173fe12f3dca77fbcb6c4b8bfe6aa0bad7ea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-06-15 11:49:09 +00:00
Tim Jenssen
039898058c qds: remove Quick Control 1 feature
Tab and TabView are not existing in QuickControls 2.

Change-Id: I16694d6015927c54087e0b4aeebb8dee245f04f8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-15 11:33:17 +00:00
Marcus Tillmanns
6453cfa412 Terminal: Don't use askpass
Askpass is not needed for terminals.
You can enter the password inside the terminal.

Change-Id: I700efbc16cbf4bd9904c8652867af894e314785b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-15 10:41:50 +00:00
Eike Ziller
3825b9f2cc CMake: Some UI/tr fixes
Avoid the order "Label [ ]" for checkboxes, we changed all cases to the
standard "[ ] Label" because it looks very ugly and confusing the other
way around. Also move the corresponding directory setting to the next
row, which is not ideal but still looks better.

Improve message about reloading presets.

Change-Id: Ibcd26e24a2a4cd3ea5ca819f74e78edb40f46072
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-06-15 10:02:36 +00:00
Henning Gruendl
21305dfeba QmlDesigner: Fix premature default state reset
Task-number: QDS-9433
Change-Id: I2709a52d0d23cfe1a1ead91a0c19f5a959e62540
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-15 09:15:32 +00:00
Eike Ziller
6c601b8cd4 Merge remote-tracking branch 'origin/11.0'
Change-Id: I8d1c9720a868da02b3157a48954eb4e262539c84
2023-06-15 09:48:58 +02:00
The Qt Project
580202f54b Merge "Merge remote-tracking branch 'origin/10.0' into tr" into 11.0 2023-06-15 07:47:28 +00:00
Eike Ziller
68915713bf Merge remote-tracking branch 'origin/10.0' into tr
Conflicts:
	src/shared/qbs
	tests/system/suite_general/tst_opencreator_qbs/test.py

Change-Id: I683ebb489e7c2112b343bb3631f6343fdc84cc4a
2023-06-15 09:43:24 +02:00