Commit Graph

72473 Commits

Author SHA1 Message Date
hjk
44cc45e000 ProjectExplorer: Make ToolchainDetector ctor arguments mandatory
Makes it easier to spot unintended use.

Change-Id: I651391aa474030351be7ff0b369bdfee896bec59
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-01-19 12:37:37 +00:00
Eike Ziller
d8e393953d Merge remote-tracking branch 'origin/6.0'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: I04ea68c9e20dc331b1f12b77c8b6f6b4db38c836
2022-01-19 13:36:24 +01:00
Eike Ziller
f708e0e70c Update copyright year
Change-Id: I42049e2b3a78ee3968e3df7dfea229c3927c3a75
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-01-19 12:34:26 +00:00
Eike Ziller
58f2bdaa9b Bump version to 6.0.3
Change-Id: I77600bb39157c7c228e1fd0aee86c4f3ec9e7e65
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-01-19 12:34:20 +00:00
Marco Bubke
704f239b55 Sqlite: Update to 37.2
Change-Id: I43087c35249af1abee5a2172f29dc998c7babd0d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-01-19 12:14:54 +00:00
Jean-Michaël Celerier
e0f539a068 Debugging helpers: support for boost::small_vector
Change-Id: Ided74fa2ebf3e4ae5258e22064bb105bd45710ac
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Ihor Dutchak <ihor.youw@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-19 11:34:33 +00:00
hjk
d8e2a3fd45 Android: De-noise toolchain detection a bit
Change-Id: Iab68004fd6310b5658bd9c3c1e23a761e3414ead
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-19 11:03:18 +00:00
The Qt Project
248b6d843e Merge "Merge remote-tracking branch 'origin/6.0'" 2022-01-19 10:52:01 +00:00
Alessandro Portale
86a00021cf Remove "iconlister" tool
It was created in an initiative by a corporate design team, in
order to gather an overview of and coordinate creation of ui
elements. No-one from that team is either still there there or
still pursues this topic.

Furthermore, the Qt Creator repository went back to the mode of
adding binary assets from various sources outside the repository.

Change-Id: I1bd4cbe232d2b2eae8181e3c6e10468266f3f05a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-01-19 10:50:40 +00:00
Eike Ziller
8db86aba4c Merge remote-tracking branch 'origin/6.0'
Change-Id: I92049adb2b200e9106513eb2275019890bd13b6c
2022-01-19 11:42:32 +01:00
Jarek Kobus
404f7a1b31 ConsoleProcess: Uniform the common interface of QtcProcess
This is a preliminary step before merging ConsoleProcess
into QtcProcess.

Rename:
processStarted() -> started()
processFinished() -> finished()

Change-Id: Ifd94722822c7628fc8130e3a6377d55d24db6eb3
Reviewed-by: hjk <hjk@qt.io>
2022-01-19 10:03:46 +00:00
Samuel Ghinet
2c8c7707c5 Enable disabled test in QDS's wizard factories
The test was disabled because it required a method to be virtual, in
order to be mocked; and where it was integrated in (branch 6.0), it was
a patch release, and we couldn't break binary compatibility.

Task-number: QDS-5691
Change-Id: If8d3101be7b92942b32ffff1d88ab0823f26e08b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-19 09:52:39 +00:00
Eike Ziller
8acd2b15a9 Disable QmlDesigner plugin for Qt 5 based builds
Design Studio is Qt 6 based only, and since QmlDesigner development is
mostly done for that and by that team, don't restrict it to stay
compatible.

Change-Id: I9252a2a34f7395d9dc6800f59a37fc23d9f30052
Reviewed-by: hjk <hjk@qt.io>
2022-01-19 09:48:27 +00:00
Thomas Hartmann
478fa56021 StudioWelcome: Add setting for splash screen timeout
Change-Id: I9e9a1b1a190a2cf04ffae5d3ac943621e5b3f9f7
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-18 22:58:15 +00:00
Thomas Hartmann
81dd1ba294 StudioWelcome: Show text for correct version
Task-number: QDS-5725
Change-Id: I040d9f1f0817fc719da060dd31ee6a04981199e3
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-01-18 22:57:47 +00:00
Jarek Kobus
d6f56254d1 Get rid of QtcProcess::workingDirectory() overload
Adapt all callers' code so that it passes the FilePath
instead of QString. As a consequence introduce
TemporaryDirectory::masterDirectoryFilePath() and use
it where easily possible.

Change-Id: I14564949b3b916921e32a2957c84c03d1da43af2
Reviewed-by: hjk <hjk@qt.io>
2022-01-18 17:18:34 +00:00
Eike Ziller
2499b88966 macOS: Use "open -R" for showing files in Finder
Instead of using AppleScript. Available since at least macOS 10.13.

Change-Id: I088efc211189aab75480b3ea02f90cc235724bef
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-18 15:03:09 +00:00
Christian Kandeler
57666c2a49 ProjectExplorer: Fix spurious GCC execution on start-up
The mingw and gcc factories share some file name candidates.
Make sure we don't test a known gcc executable again for mingw (and vice
versa).

Change-Id: Iddbf1a0c435f6515ff07fca695cb55211faab28e
Reviewed-by: hjk <hjk@qt.io>
2022-01-18 14:50:14 +00:00
Jarek Kobus
31807ab917 ConsoleProcess: limit code repetition
Change-Id: I3b07e61105b3c2a37658df438ef39bb65968aeea
Reviewed-by: hjk <hjk@qt.io>
2022-01-18 14:33:36 +00:00
David Schulz
7f4342b687 Python: add python specific language client settings
Change-Id: I1b9a194f32f3f13381954539229b02e03e3af058
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-18 13:21:53 +00:00
Miikka Heikkinen
ee4ed51a57 QmlDesigner: Fix qml warning
Change-Id: I230de5dffb47bc6e251507edf66843f24d05fa19
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-01-18 13:11:56 +00:00
hjk
f9c97d23c7 Utils: Add optional recursion for file system iteration
Change-Id: Icded897b129aebd7132376cff55717e16dffc040
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-01-18 11:52:29 +00:00
hjk
5cfe69b049 ProjectExplorer: Use a struct for toolchain autodetection parameters
Also, make some functions const and use an alias for QList<ToolChain *>.

Change-Id: I6a1cbcb79bfaa9d252c4b69e00aa93e5d0dabe2f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-01-18 11:25:34 +00:00
Tapani Mattila
c57573708a Move qrc, rcc and CMakeLists.txt generating menu option to file menu
Task-number: QDS-5903
Change-Id: I42cba21eaecaf5580c40dab8ce32bbf12c37f13f
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-18 10:32:25 +00:00
Mahmoud Badri
54e7d41726 QmlDesigner/StateEditor: Remove default state's yellow highlight
Task-number: QDS-5973
Change-Id: Ie4b82bfbbb91a48152a969bb988220303854709d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-01-18 10:15:00 +00:00
Eike Ziller
3749cfc896 InfoBar: Make adding more buttons possible
Change-Id: Ic0c946cf3f87fe46cd06391f38e0bc71374ad340
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-01-18 09:33:20 +00:00
Eike Ziller
f884ff2160 Revert "Avoid starting threads from the wrong hosting thread"
This reverts commit 1421694d17.

The commit broke e.g. Utils::mapReduce(....).results() in the main
thread. Since the main thread blocks, it cannot start a new thread.

Change-Id: I63abd07bcf002546740d0a7627f1fd2007c8b70c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
v6.0.2
2022-01-18 09:06:50 +00:00
David Schulz
49ac087955 Python: move language client functionality out of utils
There will be more lsp specific functionality so moving it into its own
space is reasonable.

Change-Id: Ic87d437182d68673b53f662c804707138fef5b6c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-18 08:14:57 +00:00
Jarek Kobus
1ba6faeea0 Disable showing/hiding magnifier by pressing Alt modifier
The Alt modifier doesn't work well with mouse wheel
as it causes the horizontal wheel to be triggered.
Disable the Alt modifier as a shortcut for activating
the Magnifier. When Magnifier is shown by activating
the toolbar action, the magnification works by simple
mouse wheel without any modifier.

Fixes: QTCREATORBUG-25612
Change-Id: Idb7c40dbf92ed135a796c9623cc46b6b1e80e9e6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-01-18 08:12:07 +00:00
David Schulz
8f98ac4120 LanguageClient: remove obsolete "New" in add menu
nobody wants to add an old server...

Change-Id: I06d1d6eba7340181fad876753f888393dab3187f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-18 06:03:13 +00:00
David Schulz
62c36f516b TextEditor: Fix skipping short lines
Fixes: QTCREATORBUG-26878
Change-Id: I2d801e3c7e91bad928b203bbca32fdc7b1cdca6e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-18 05:45:43 +00:00
Eike Ziller
6914deb0da Merge remote-tracking branch 'origin/6.0'
Change-Id: Ie8406c1854738cabcc85ef6ddaee7559d5227bec
2022-01-17 16:52:31 +01:00
Cristian Adam
a0836a29c7 CMakePM: Refactor "Initial Parameters" as a tab bar item
Now we have "Initial Configuration" and "Current Configuration"
as tab bar buttons.

This way the UI can be shared between the two configuration states.

Task-number: QTCREATORBUG-26869
Change-Id: I8206032a2a5ac076629865057816edb99706f2ff
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-01-17 15:23:19 +00:00
Thomas Hartmann
a87a500c77 QmlDesigner: Remove Goto implementation from Design Studio
Task-number: QDS-5951
Change-Id: I5503f27508ec0e0f76506083baad3969730c651d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-17 15:13:02 +00:00
Henning Gruendl
b12b656588 QmlDesigner: Fix UrlChooser not showing items
Change-Id: Ie9cb697837e9a6a5be666a598dffdee52f90fd08
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-17 15:12:33 +00:00
Thomas Hartmann
dab8caf6d9 StudioWelcome: Enable integrating download progress
Change-Id: Iad18c1a0bc49f87a98dcdff46542cf4c373de875
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-01-17 15:09:43 +00:00
hjk
4c21852ec6 QmlDesigner: Fix compilation
Amends c1c147a9dc.

Change-Id: Ib6d58e607a234424e77516dbb0fa07599a25f68e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-17 14:39:17 +00:00
Mahmoud Badri
e4bf7ce3a1 QmlDesigner: Remove docking widgets top right controls
Fixes: QDS-5983
Change-Id: I3d7b7c33816de69351134c3ad3e4b65d89f6c0cf
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-01-17 13:26:10 +00:00
David Schulz
22f4e9497d CMake: Fix build dir scan filter
Fixes: QTCREATORBUG-26846
Change-Id: I54f0249410cf0dd5cc6703767cea187a2d843868
Reviewed-by: hjk <hjk@qt.io>
2022-01-17 12:25:52 +00:00
The Qt Project
6ece15f587 Merge "Merge remote-tracking branch 'origin/6.0'" 2022-01-17 12:19:29 +00:00
Christian Stenger
9be03a826d PE: Fix compile
Amends c1c147a9dc.

Change-Id: I2f4e6e724f3226541c5de683d0ac6403538622be
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-01-17 11:36:28 +00:00
Cristian Adam
5effbc836f CMakePM: Do not sort kit CMake parameters
As a user when I add CMake parameters in the Kit's CMake section
I expect the order of parameters not to change.

If I add something at the end, I expect to find the value at
the end.

Change-Id: I4f0e2d9b845dddb7c9d6b012945ab61b0135267c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-01-17 11:29:16 +00:00
David Schulz
fa53849b4a Editor: prevent using function hint widget while it is deleted
Task-number: QTCREATORBUG-26872
Change-Id: I634b488073670476ee3d5b53296e77b6779e5715
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2022-01-17 10:45:17 +00:00
Jarek Kobus
e1f45507c5 LanguageClient: fix possible crash on shutdown
Iterate on a copy of managerInstance->m_clients
when calling shutdownClient() or deleteClient(),
since both methods may potentially modify m_clients
list and thus invalidate outer iterators.

Surprisingly, this patch also fixes the leak
of RunControl and RunWorker instances on shutdown.

Task-number: QTCREATORBUG-25709
Fixes: QTCREATORBUG-26847
Change-Id: Ib34d913a6ae0b235631d3d619bddaf4e08b4aec2
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-01-17 10:31:59 +00:00
Thomas Hartmann
f9c21253c0 QmlDesigner: Use wildcard for all files and split image formats
Having a large filter makes the dialog unresponsive, so all files
filter is changed to *.* and image formats are split according to
mime type.
For unsuported suffixes we show an error message.

Task-number: QDS-5921
Change-Id: Ia2dc912c7e7004da97da48753562173ed163436f
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-17 10:28:14 +00:00
David Schulz
c926db336b LanguageClient: always delay document highlight request
The request for highlights of the symbol under the cursor takes a
considerable amount of time on some servers (at least python). Postpone
those requests a bit so that more important requests can be handled
before.

Change-Id: I35776076a4ee9c0c9b7646e960d3d965506154d3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-17 10:23:03 +00:00
Eike Ziller
491e5c4176 Merge remote-tracking branch 'origin/6.0'
Change-Id: Ic1790446cb453e3d8a24467a31e3c8df33bc68bb
2022-01-17 11:22:11 +01:00
Eike Ziller
33f2074272 Bump requirement to Qt 5.15.2
Qt 5.15.2 includes API that makes transitioning to Qt 6 easier.
We currently have workarounds for Qt 5.14 in place that we can
remove when requiring 5.15.2, and we also can stop adding workarounds
for new code.

Change-Id: I920fdccc41d755a6ad39cb5161cd916999fee755
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-17 10:20:32 +00:00
Christian Stenger
358146a322 Scripts: Make uichanges script work with Python 3
Change-Id: Ieb5abc4845098b62afa37a3e0e0fdf88326da2ab
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-01-17 10:15:45 +00:00
Christian Stenger
64b6aca212 Core: improve logger performance
Messages can be rather huge. Limit the length to avoid costly
background painting of what is not visible at all.
Full message can still be seen in tool tips or when copying
or saving the logs.

Also postpone scrolling to bottom of the view since it triggers
layouting the text.

Change-Id: I13bf136a32f0f51f636c89cea85a5be23cd4fe9a
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-17 10:15:32 +00:00