Commit Graph

74059 Commits

Author SHA1 Message Date
Robert Löhning
7a8ca55f77 Squish: Introduce helper function for checking for strings
In Python3 type unicode is unavailable since it's implicit with "str".
The new functions helps porting code.

Change-Id: I5de0fa182acbbaf267ed51f66f658cb9c884f4c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-28 11:00:35 +00:00
Robert Löhning
4980f71dd5 Squish: Update tests which use "Rename Symbol Under Cursor"
When using this on open files, Creator used to make the changes
but not save the file. Creator 6 now also saves the file unless
it already contained other changes. Because the file is being
saved immediately, "Save All" and "Revert to Saved" cannot be
used in this situation anymore.

Change-Id: I0b8a58d998c54ccceae6d178b2c7a6f6182c7ad0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-28 10:59:39 +00:00
Alexander Drozdov
5c53dc5e13 Ssh: fix crash on freed memory access
At the cleanup() method we must remove connection from the m_connection
list to avoid access to the freed memory from the
removeInactiveConnections() that caused Qt Creator crash.

Change-Id: I8195f05e903819e3e3b48b2f72fd71047c5a1636
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-28 09:46:22 +00:00
Miikka Heikkinen
557489c3fc QmlDesigner: Fix camera frustum initialization for Qt5 builds
In Qt5 builds, we need additional async update at camera geometry
initialization to ensure source camera is up to date and frustum mesh
can be constructed.

Fixes: QDS-6071
Change-Id: I41371ae66fde432b0fdf4b5fee6a0604d005bf63
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-28 09:00:57 +00:00
Miikka Heikkinen
161d25571b QmlDesigner: Change camera id in 3D app template
Id "camera" conflicts with property name on View3D.

Task-number: QDS-6081
Change-Id: If6a06a9aff75620fc657a8285ac6b2b2a1e8ebc0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-28 08:59:15 +00:00
Miikka Heikkinen
94a17f1e7e QmlDesigner: Fix 3D picking of RuntimeLoader loaded models
RuntimeLoader creates the loaded nodes dynamically, similar to
Repeater3D and Loader3D, so handle it similarly as well.

Fixes: QDS-6053
Change-Id: Iece15254e720cfc0a6796b182ef00c3a773cf35d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-28 08:58:49 +00:00
Christian Stenger
5887d13d46 Docker: Fix crash while removing auto detected toolchains
Change-Id: Id0cf4346b97f54247ad81ae0d93a42935dca8a0f
Reviewed-by: hjk <hjk@qt.io>
2022-01-28 07:09:24 +00:00
Christian Stenger
5c1b4d2b48 Debugger: Fix removing auto detected debuggers
Do not remove items while iterating over the tree
or we may crash when removing more than one.

Change-Id: I007672be94a7e6449cf25c965c07ca714049ae97
Reviewed-by: hjk <hjk@qt.io>
2022-01-28 07:09:15 +00:00
Alexander Drozdov
3869487a47 Allow to build ClangFormat plugin with CLANGTOOLING_LINK_CLANG_DYLIB
Some Linux distributives provides moders clang without separate libs
compiled, like libClangTooling and so on. Just provide libclang.so and
libclang-cpp.so.

Qt Creator provides way to handle such clang installation by
pointing flag CLANGTOOLING_LINK_CLANG_DYLIB=On for CMake. But
ClangFormat still keeps from building. Fixed it.

Change-Id: Id420f82c47c4205c8cd631aa04be6771628984be
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-01-27 22:20:58 +00:00
Orgad Shaneh
707e7ba41f ClangFormat: Suppress warnings from llvm
Change-Id: Id79abc3ea87576a681d86a7c1bd3be957acc299f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-01-27 20:15:15 +00:00
Aleksei German
35d32c9784 QmlDesigner: Update for QUL metadata
Task-Numbers: QDS-5867, QDS-5890
Change-Id: If27d947d88e34f8479796520dad2bee62a6d0ec9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-27 16:26:01 +00:00
Leena Miettinen
8ace5d3895 Doc: Update info about ClangFormat options
The options are now in a separate tab.

Fixes: QTCREATORBUG-26597
Change-Id: If2d337c132f468897cd71e217205c3db29028f34
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-01-27 14:58:21 +00:00
Eike Ziller
a89f6919d2 StudioWelcome: Only replace wizards when running as Design Studio
Task-number: QTCREATORBUG-26936
Change-Id: I11c14bd916a7139fc4d133b8b3b8a79fa7770409
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
qds/v3.0.0
2022-01-27 12:24:46 +00:00
Tapani Mattila
a117a558fe CMake generation: Streamline confirmation dialog
Task-number: QDS-5991
Change-Id: I1cec8650703ca5de936739d1adbba77d0b64562e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-27 11:00:04 +00:00
Christian Stenger
95595db7d1 Docker: Drop handling of critical pattern again
Drop lately introduced handling of critical pattern and
just drop the critical pattern instead for now.
Brings back gdb when auto detecting debuggers.
Amends 22dd26bc76 and 181e74ebc3.

Change-Id: Icde46e9bfa82d5cf1252e46f1e0a84b638927473
Reviewed-by: hjk <hjk@qt.io>
2022-01-27 10:53:48 +00:00
Christian Kandeler
5c1dc40b6c CppEditor: Switch on clangd by default
Also change the corresponding settings key to force-enable it with
existing settings.

Fixes: QTCREATORBUG-22917
Change-Id: I3b5f54bf5d4261c6e4250245f44c4c360a911e5e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-01-27 10:47:35 +00:00
Christian Kandeler
6993bc7382 Fix various warnings
Change-Id: Iea85f4b890ce7700e8b3632de4656cf848729a36
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-01-27 10:42:23 +00:00
Alessandro Portale
859fa57648 ProjectExplorer: Sort loaded sessions by time in reverse
Fixes: QTCREATORBUG-26939
Change-Id: I2152dbf7c06dbdc511b4db143efe3375cdad04f1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-01-27 10:25:36 +00:00
hjk
4e34921451 ProjectExplorer: Rename DeviceProcess::error to errorOccured
That's what QProcess favors nowadays and QtcProcess uses.

Change-Id: Ie9492ae62f23e35a8a70f72196c3d1b6bc50cbdc
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-01-27 10:12:38 +00:00
Alessandro Portale
a386725c6c Utils: Support sorting by QDir::Time in FilePath::dirEntries
Amends: f9c97d23c7

Task-number: QTCREATORBUG-26939
Change-Id: I9122d51af102547086687b1b9c6cb1553b609673
Reviewed-by: hjk <hjk@qt.io>
(cherry picked from commit ec0513bf4b)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-01-27 09:22:06 +00:00
hjk
0813a08b1e Docker: Re-do auto-detection of Qt
This now properly iterates into subdirectories when selecting the
"Search in selected directories" option for the auto-detection
so it works with Boot2Qt images that don't put Qt in PATH, but
somewhere under /opt

Change-Id: Ifc337c0169d4b98b4e894a5d7e8286f171e0c569
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-27 09:08:33 +00:00
Eike Ziller
0c0bd8777a Merge remote-tracking branch 'origin/7.0'
Change-Id: Icaa605bcaa44ad50a98a63251cb4553bfd411b0a
2022-01-27 09:41:53 +01:00
Eike Ziller
79fd6510a3 Merge remote-tracking branch 'origin/6.0' into 7.0
Change-Id: I8b1cdfb72b0e3e583c94447f13d0161b99fa93c1
2022-01-27 09:37:39 +01:00
Alessandro Portale
ec0513bf4b Utils: Support sorting by QDir::Time in FilePath::dirEntries
Amends: f9c97d23c7

Task-number: QTCREATORBUG-26939
Change-Id: I9122d51af102547086687b1b9c6cb1553b609673
Reviewed-by: hjk <hjk@qt.io>
2022-01-27 08:36:02 +00:00
Christian Stenger
181e74ebc3 Docker: Fix iterateWithFind()
Amends 22dd26bc76.

Change-Id: I0be8d8236795a9e93ab93f89df56fd14e378e6e6
Reviewed-by: hjk <hjk@qt.io>
2022-01-27 08:24:08 +00:00
Eike Ziller
3c63395d78 Merge remote-tracking branch 'origin/master' into 7.0
Change-Id: I717f2002c159557fdb6225b8259db26dd57c8da1
2022-01-27 09:10:46 +01:00
Eike Ziller
f9de2f2b23 Qt Creator plugin wizard: Bump checkout github action to v2
v1 has security concerns

Change-Id: Ia88cf55197a64af819abe07bdac698a29bec8aeb
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-27 08:06:28 +00:00
Christian Stenger
c492b29a45 Nanotrace: Make nanotrace commonly usable
CMake's auto symbol export is a plain hack and does not work for
other build systems.
Besides fixing some non-working implicit conversions when using Qt5.15.

Change-Id: I80b77a4ebf8cad30c78c1c2ef2034e62d2063399
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-27 05:38:48 +00:00
hjk
abbd6cdc8c CMake: Use CommandLine to create the initial default parameters
This has at least theoretically the potential to get quoting in
"cross" configurations right. Since the consuming side is not ported,
there should be no noticeable differences yet.

Change-Id: I933ded4b1c9645055d3114d53f3d1b95b5c5539c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-01-26 18:09:31 +00:00
Christian Kandeler
f2819878b1 ProjectExplorer: Fix crash in toolchain dialog
This amends 6cec0e2033, which did not take the bizarre code in the
derived class into account.

Change-Id: I508d483c8d38b2b99b3901ac0603c1bc016ee0ac
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-26 15:46:14 +00:00
hjk
2b6f26dee2 ProjectExplorer: Use a lambda for DeviceFactory::create()
Somewhat slimmer interface on the user code side and follows
existing practice.

Change-Id: I20ed8f5a00591265d32ea9ce93e1f1bbc76d2437
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-01-26 14:51:09 +00:00
hjk
f6cb638345 ProjectExplorer: Make Tasks a QList, not a QVector
That's what it is going to be in Qt6 anyways.

Change-Id: I8a059fc0e4d8bb5a1e3138071613b1d72a08d15b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-26 13:16:25 +00:00
hjk
1fc83d2a56 Utils: Wrap various file system iteration flags and filters
... into a single class.

This makes passing them around as a whole easier, and opens a path
to have "generic" filters in form of a lambda or such.

Change-Id: Ibf644b2fedcf0f1a35258030710afff8f5873f88
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-01-26 13:13:41 +00:00
Thomas Hartmann
3e1095076e QmlDesigner: Split image category only for dialog
If we split the categories on the action level, then
a separate dialog is opened for every image suffix/type.


Task-number: QDS-6076
Change-Id: Ie80203cebca41e8dee4cb5c091b1163a9fde6e26
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-01-26 13:13:30 +00:00
Eike Ziller
c6fdb66b2b Collect Qt Creator debug menu items into common submenu
instead of spreading them over the place.

- rename "Logger..." to "Show Logs..."
- create "Tools > Debug Qt Creator" menu and put "Show Logs", "Inspect
Language Clients" and "Inspect C++ Code Model" there
- add missing ellipsis

That gets rid of the otherwise not useful "Language Client" submenu, and
creates a nicer place for the "Show Logs" item.

Change-Id: I2588b4c93327669579979dfbfce37005ada29dab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-01-26 12:59:21 +00:00
Alessandro Portale
77749e6e28 QtSupport: Resurrect the "screenshot cropper" tool
After many Years, it is time to refresh "images_areaofinterest.xml".
That is best done with the "screenshot cropper" tool.

Change-Id: Icd07e1c1697e236855d3a03ae8977044d21d78f7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-01-26 12:47:35 +00:00
Christian Kandeler
5207374d5d ProjectExplorer: Allow multi-selection in issues pane
Users should be able to copy or remove several issues at once.

Fixes: QTCREATORBUG-25547
Fixes: QTCREATORBUG-26720
Change-Id: I1ac75a3445c37200b6a01dd8c5d79d2b69c54a3c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-26 12:23:58 +00:00
Jarek Kobus
2c96ee2ee4 Get rid of ConsoleProcess
Use QtcProcess in Terminal mode instead.

Change-Id: Iba237f3ee3e5802eed494e4ea9caf7c4ad1bc61a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-26 11:47:33 +00:00
Cristian Adam
795d7364df CMakePM: auto-setup.cmake do not fail if QtCreator.ini doesn't exist
There are Qt Creator installations that do not provide
"QtProject/QtCreator.ini" file, and without it the auto-setup.cmake
code would fail.

Task-number: QTBUG-99273
Change-Id: I7674f68bc89375d8065d820b89650a358a7226b2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-01-26 11:25:19 +00:00
Eike Ziller
4fc883d491 Merge remote-tracking branch 'origin/7.0'
Change-Id: I41a6ebf620995e8a7bed798c4212de5319db5492
2022-01-26 10:00:33 +01:00
The Qt Project
b840e891d5 Merge "Merge remote-tracking branch 'origin/6.0' into 7.0" into 7.0 2022-01-26 09:00:01 +00:00
Orgad Shaneh
f932cef15a Git: Adapt grep to new default coloring in Git 2.35
Change-Id: Id830d3341974f70e4ce6b419152d3558bba2a95f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2022-01-26 08:35:47 +00:00
Eike Ziller
be5fb98f1f Merge remote-tracking branch 'origin/6.0' into 7.0
Change-Id: I72684fe4b0857e52a15ee83721f9d7975582a8d2
2022-01-26 09:25:13 +01:00
Christian Kandeler
9def720ef6 Fix qbs build
Change-Id: I14251eae0bba2849c2049cf9a2020168c26cb24e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-26 05:39:40 +00:00
Alessandro Portale
43a9423a9b Wizards: Make wizard icons a bit lighter
Changing the Wizard icons into themed ones turned them quite dark (in
non-dark themes). This change mitigates the issue by making the dark
lines thinner and shaded areas smaller and brighter (vice-versa for dark
themes).

Amends: 05e89384e2

Fixes: QTCREATORBUG-26565
Change-Id: Ie1d251d6443576c4e5db26a2b1485b4f4ab63f82
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-25 17:44:21 +00:00
Jarek Kobus
addb8e97ba SshDeviceProcess: Use QtcProcess in terminal mode instead of ConsoleProcess
Change-Id: Icf4dac4be19878e6f46547d198a85291db80e02a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-01-25 17:23:35 +00:00
Jarek Kobus
c216e883b2 QtcProcess: Forward declare QTextCodec
No need to include it in the QtcProcess header.

Change-Id: Ie1acfeaad332bbd2205f3457ad313d9fabed69b7
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>
2022-01-25 17:20:53 +00:00
Jarek Kobus
18fdad280a ApplicationLauncher: Use QtcProcess in terminal mode instead of ConsoleProcess
Change-Id: Ie1f8385fe151d65acc584456cb2328aca12b15cc
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-25 17:20:43 +00:00
Henning Gruendl
250738d858 QmlDesigner: Fix icon font
Change-Id: I31a656e711d1bff24eedfc80ee5c62c594c03c19
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-25 15:41:28 +00:00
Jarek Kobus
e28d2a88b2 PythonUtils: Use QtcProcess in terminal mode instead of ConsoleProcess
Change-Id: Icd8a481a03a2a13f5556327ce5caf661a5d19321
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-01-25 15:07:50 +00:00