Commit Graph

62421 Commits

Author SHA1 Message Date
Thomas Hartmann
ab9d0294da StudioWelcome: Add progress to data download
Change-Id: Iffda006ac96858ad9c6490c7d0b33565249d6809
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-05-19 09:41:36 +00:00
Thomas Hartmann
43700fa621 QmlDesigner: Fix crash on shutdown
Change-Id: I47e20e14fe22dcad77a65b031cf65bc80bad3490
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-05-19 09:39:49 +00:00
Thomas Hartmann
bf96cd2496 QmlDesigner: Fix crash on shutdown
Change-Id: I95c37a33d7ad346b9d5d031bbfe022527c70e253
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-19 09:39:39 +00:00
David Schulz
f67a778d2e Macro: fix saving macros
QMap::count returnes a size_type with Qt 6 in contrast to an int with
Qt 5. Convert this value always to an int to be backwards compatible.

Fixes: QTCREATORBUG-27543
Change-Id: Ibd37ede40e5eb4cd5e5172529455196242a97666
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-05-19 08:57:49 +00:00
David Schulz
36872d0ee4 Coco: beautify the start coco dialog
Increase the default horizontal space and add a spacer between the
controls and the button box

Change-Id: Id6ce9b923b8270947f315cfce36728e71942f8dc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-05-19 08:13:25 +00:00
Jarek Kobus
f58a25b60a CMakeProcess: Delete the watcher prior to finishing the future
Delete the watcher from the handleProcessDone() handler
in order to avoid a circular call to the handler in case the
handler canceled the task.

Delete the watcher also from destructor, prior to canceling
the task.

Fixes: QTCREATORBUG-27564
Change-Id: Ic5859ea159f66106602ed1bf1fc32e439edf28d9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-05-19 07:58:07 +00:00
Eike Ziller
b6dcca00c9 FakeVim: Fix compiler warning
Remove unused lambda capture

Change-Id: I973a5a6be6e2c27450ab80bbb87c9077f0ecd3e9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2022-05-19 07:51:16 +00:00
Eike Ziller
5e9d34793c BinEditor: Fix compiler warning
Unused lambda capture

Change-Id: Ic4d633b794a36d663644c761a0c2d024deee2dd9
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-05-19 07:51:07 +00:00
Artem Sokolovskii
66f132dd9b TextEditor: Remove foreach / Q_FOREACH usage
Task-number: QTCREATORBUG-27464
Change-Id: Ie9594bf661dbeecf22589c1580648252f0bfb7fb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-05-19 07:33:27 +00:00
Orgad Shaneh
a2797ec80e VCS: Append newlines to system messages in output pane
Change-Id: I3ca2d2e90ea0a97dd75feb7d1f8220564a138fb5
Reviewed-by: hjk <hjk@qt.io>
2022-05-19 06:15:44 +00:00
Thomas Hartmann
757b6554d8 QmlProject: Fix typo
Change-Id: Ie376933f2a83b0d5ceb22ad1b0e335d052c08135
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-05-18 19:42:34 +00:00
Thomas Hartmann
c91dba1d21 StudioWelcome: Fix readme path
Change-Id: I3173a10a9944c9247fbded170ade979b4bb45afe
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-05-18 16:14:42 +00:00
Miikka Heikkinen
6df6475ccd QmlDesigner: Fix initial form editor scroll/zoom for 3D previews
Preview item was initialized to zero size rect and form editor view
scroll/zoom was not updated when size was corrected later as preview
image was received. Since we use fixed size preview images, we can
initialize the preview item to that size to fix the issue.

Change-Id: I8198af1b830498f6540a783d770abdfb8a8860f4
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-05-18 14:17:36 +00:00
The Qt Project
995a464f46 Merge "Merge remote-tracking branch 'origin/7.0'" 2022-05-18 13:19:44 +00:00
Alessandro Portale
db7ba4ad6f QmlProjectManager: Fix CMake build with absent Qt5::QuickWidgets
Change-Id: Ic6c211a629bc4e5f215abad0bd80c6edb64f5c5d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-05-18 12:33:29 +00:00
Christian Kandeler
5d615e916f LanguageClient: Improve refactoring markers
Clicking the lightbulb should bring up a menu if and only if there is
more than one possible action for this location.
Amends 089e1edcbf.

Change-Id: I45348ed4fbf9b3f32e19bbe17f0c2c030ecd24ed
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-05-18 11:39:00 +00:00
Eike Ziller
6a296ab68a Merge remote-tracking branch 'origin/7.0'
Conflicts:
	src/plugins/qmlprojectmanager/qmlprojectplugin.cpp

Change-Id: I14030f58303839e706af892dd12a67566e3bed68
2022-05-18 13:35:47 +02:00
Artem Sokolovskii
54d4c4db62 QmlJsEditor: Remove foreach / Q_FOREACH usage
Task-number: QTCREATORBUG-27464
Change-Id: I77741a639d8585d1e0ad04d7c5e6588852202e4a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-05-18 10:40:48 +00:00
Christian Kandeler
840263eb9a CppEditor: Switch off "extract function" quickfix with clangd
There is a clangd tweak that does the same, but better.

Fixes: QTCREATORBUG-13240
Fixes: QTCREATORBUG-18607
Change-Id: I59822c725ccb38d995fd8ac03861b1931b81f74c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-05-18 10:23:50 +00:00
David Schulz
8a64d7229e LanguageClient: Use correct tree view for messages in inspector
Change-Id: I547584826de48d5db6cf55d9871521385ee1a04a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-05-18 10:06:00 +00:00
hjk
72a2083cd1 ProjectExplorer: Shift full FilePath creation into Executable aspect
Less need for correction: When a target is given, the executable
produced by the aspect will be on the target device.

Change-Id: I86c38e9f9fa5b4d4fe9b2ef7f21a0b3aa5b28670
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-18 09:50:40 +00:00
hjk
8737dfd962 Valgrind: Start fully qualified FilePath earlier
Change-Id: Ib768e02033267d07278b7279a8172d237ebaa59d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-05-18 09:50:22 +00:00
Christian Stenger
5fe7b3ad6a QmlProjectManager: Do not establish connecttions when using Qt5
Amends 8bb1a862a0.

Change-Id: I4186dda881f06295788e1fe4d6165c999fdbe574
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-05-18 08:52:27 +00:00
Christian Stenger
8180535ccc QmlProjectManager: Fix build with Qbs
Amends 8bb1a862a0.

Change-Id: I6fedc5f5dd1d505790bf0a27319250f274a3d895
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-05-18 08:52:20 +00:00
Jarek Kobus
d6ee5cb163 Remove algorithm.h from jsonfieldpage.h
Change-Id: I15dfae3568030c169785c33e7957ecba3e975b65
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-18 08:38:11 +00:00
Jarek Kobus
6cd736fe6c Remove algorithm.h from buildtargetinfo.h
Change-Id: I777212fb94d46c1c71f017288b7e38dd5db62a91
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-18 08:38:05 +00:00
Henning Gruendl
259759b5c9 QmlDesigner: Fix typo
Change-Id: If6860fe3094124dcac381f72ae88722759167354
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-05-18 07:37:50 +00:00
Eike Ziller
2334041338 Update qlitehtml to latest master
Includes suppressing compiler warnings from litehtml itself

Change-Id: Ib603c133e60599b2f9d70ffdd20a73710d8aa4fe
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-18 06:45:06 +00:00
Thomas Hartmann
de7a7b6ac8 QmlProject: Allow setting main qml file and main ui.qml file
The .qmlproject file already has the "mainFile" setting which indicates
which qml file is run. This patch adds a main ui.qml file that indicates
which ui.qml file is opened in the design mode if the .qmlproject is opened.

The patch also adds two context menu actions that allow setting the main qml
and main.ui.qml files without having to edit the .qmlproject file by hand.

Changing the main ui.qml file also checks if the current ui.qml file is
used as in the main qml file and if it is, then we switch the component there.

For now the actions are only available in QDS.

Task-number: QDS-6882
Change-Id: I1c6e19c039036dc635161fa6e06173356dc509aa
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-17 15:17:12 +00:00
Thomas Hartmann
5e31fae6d9 Hide Debug/Build side bar action if menu is disabled
Change-Id: I8c7a2e5f0bb76e74692c6b4463aa1feb806d6e49
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-05-17 15:11:33 +00:00
Henning Gruendl
e865b03448 QmlDesigner: Fix bound properties change behavior
Changing a bound property was triggering a value change twice. Once with
the previous value and another time with the newly set value. This was
solved by locking the binding property change emit with a scope lock.

Change-Id: I9605269e911f0468b2d52d74ad8a2a43f907a18c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-05-17 14:09:46 +00:00
Artem Sokolovskii
d73d5fe0b1 ProjectExplorer: Remove foreach / Q_FOREACH usage part 3
Task-number: QTCREATORBUG-27464
Change-Id: Iab4740dd2f475febf7532f0a02407b0088d54068
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-05-17 13:08:53 +00:00
Jarek Kobus
dcc93253c8 FileTransfer: Add some static helpers
Change-Id: Ie22e7ecce52b308df32316ff85d4744bd26060b0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-05-17 12:55:20 +00:00
Eike Ziller
3967bbc22f Macros: Fix shortcut display on macOS
Some "NativeText" parameters were missing.

Change-Id: Id08b8281d1458c05ff302011e32d8babbaf7b2bc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-05-17 11:56:52 +00:00
Eike Ziller
c311b8e0fa ClangFormat: Ignore compiler warnings in clang-format headers
By making the include paths "system" includes.

Change-Id: Idf417195b921c2cd861efc24b814a30f5739eef5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-17 11:55:26 +00:00
Tapani Mattila
d35b9547f8 QmlJsEditor: Change "always open with QDS" setting type to combo box
Task-number: QDS-6807
Change-Id: I7e98781ee423be25a13fac5eee84caae5b11562f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-05-17 11:19:55 +00:00
Tapani Mattila
8bb1a862a0 QmlProjectManager: Integrate QDS landing page
Task-number: QDS-6564
Change-Id: Ia1a4188ba1bb561bbfeadf5fb29bcba75d05b5ce
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-05-17 11:19:49 +00:00
Jarek Kobus
515845b815 RsyncDeployStep: Use FileTransfer for rsync
Instead of constructing custom ssh command.
Create the mkdir process on stack.

Change-Id: I3944ec4e2979b820a40971a8836e36084a44902a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-05-17 10:19:29 +00:00
Jarek Kobus
80ae9c357d FileTransfer: Add test() method
The test() method doesn't try to transfer anything,
it just tests if the transfer itself work.
In contrast to start() method, the FilesToTransfer
list may be empty and test() method will not issue
an assert.

Change-Id: I719cfbaddc5e33d6a7cc660ef6aa0bbcb61c5bce
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-05-17 10:19:10 +00:00
Alessandro Portale
13bfb06581 ProjectExplorer: Avoid line breaks in ABI tooltip
By wrapping the html into a div with style="white-space:pre".

Task-number: QTCREATORBUG-27553
Change-Id: I108faa8e4c509d06f8a9a4892604d0aa4c33a042
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-05-17 10:13:31 +00:00
Christian Kandeler
affa2cda9e CppEditor: Tell users about clangd configuration files
It's not feasible to map every possible setting into our UI, so instead
teach people how to use the clangd configuration mechanism.

Change-Id: Id11e81e25b687a4f49af4e090203faca3a75722d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-05-17 08:56:32 +00:00
Christian Kandeler
a5dc6f8434 ClangCodeModel: Switch on clangd's Include Cleaner
Task-number: QTCREATORBUG-147
Task-number: QTCREATORBUG-14040
Change-Id: Ib215ed3bbb6f42d25752c747693371239222e67a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-05-17 08:51:26 +00:00
Alessandro Portale
55615e83f5 Utils: Avoid line breaks in variable chooser tooltip
By wrapping the html into a div with style="white-space:pre".

Task-number: QTCREATORBUG-27553
Change-Id: Ie8c4dcbe48d714fe72949afb841e5b4844e12cd1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-05-17 07:17:26 +00:00
David Schulz
0b6bc0d187 LanguageClient: Move the BaseMessage to JsonRpcMessage conversion
... to the client interface. JsonRpcMessages are the only messages used
so far and no other types of messages are currently used by any of the
supported Language Servers. If a client is going to need special message
parsing it can still implement a specialized client interface and
overwrite parseCurrentMessage. This is the preparation to move receiving
and parsing data passed to and from the language server out of the GUI
thread.

Change-Id: Ibd4cd95daab7efff947273ca9e7d457de0286f47
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-05-17 04:31:06 +00:00
Jarek Kobus
819d6ad753 Implement RsyncTransfer
Change-Id: I07a9139bc5280a4f4b16181121ce7ab907493e72
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-05-16 17:27:42 +00:00
Jarek Kobus
7cca6cd718 FileTransfer: Make the usage more convenient
Prepare the API for rsync implementation.

Change-Id: I13b7def31c2e2b1460d18340f6bd7cbd8e0e9434
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-05-16 17:27:29 +00:00
Christian Kandeler
15665680df CppEditor: Use "auto" in AssignToLocalVariableOperation
Fixes: QTCREATORBUG-9577
Fixes: QTCREATORBUG-18412
Change-Id: I46a925611939a3dade142eaf76e20090ae203856
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-05-16 14:35:10 +00:00
Mahmoud Badri
bf49d143e8 QmlDesigner: Fix warning in AbstractView::dragStarted()
Change-Id: I3fc0bede9fd58b7c63cf6c28a982e4662766f375
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-05-16 13:26:58 +00:00
Eike Ziller
3db3b441db FileSearch: Some micro-optimization
Fixes: QTCREATORBUG-27552
Change-Id: I1b4677af59f335df676d32c2bb0e1dbd5a9dd14b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-05-16 13:23:20 +00:00
Jarek Kobus
9a4164a4de CMakeProcess: Don't use QTimer for checking the canceled state
Create a QFutureWatcher instead and connect to its canceled()
signal.

Replace some includes with forward declarations.

Change-Id: Ie82bf8902ef8c8d87011809bd14b7db3d4f52179
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-05-16 12:37:18 +00:00