Commit Graph

71171 Commits

Author SHA1 Message Date
Jarek Kobus
0b96a1b76b Ignore the wheel event explicitly in order to propagate it further
Qt 6 brings a behavioral change regarding delivery of wheel events:
92df790f46b3a8b17aec2f385d6472fd3f8647f6 and
2a857ee28315c5bacfe2ecaf402ca9005b35c20e. If there is an event
filter installed and wheel event is being processed, the event
is now accepted by default, which means that after returning
true from eventFilter(), the event is not propagated anymore.
Since we want to redirect the event to the parent HelpViewer object,
we explicitly ignore the event prior to returning true.

Task-number: QTCREATORBUG-26369
Change-Id: I2fc8b7c8bfbc343a9ca7951684ced405f8a55039
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-10-07 14:26:18 +00:00
Eike Ziller
69fbe0ab90 ImageViewer: Fix crash when opening invalid movie
Qt 6 sends the finished signal directly from QMovie::start, so if we
connect QMovie::finished directly to QMovie::start, we end up in
an endless recursion and stack exhaustion.

Use a queued connection, and do not restart a movie if it went
invalid.

Fixes: QTCREATORBUG-26377
Change-Id: I9980615f44d0cf7e92f85c010427bd6b67046949
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-10-07 13:26:58 +00:00
Christian Stenger
4bea534c62 CMakePM: Do not register qch files from device
Change-Id: Ie6f8ce74d500d18b69fd5017ddd820356515c21a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-10-07 13:26:56 +00:00
Thomas Hartmann
8f974cd1c5 QmlDesigner: Implement new functions in QmlObjectNode and QmlTimelineKeyframeGroup
* QmlObjectNode::allInvalidStateOperations
 * QmlTimelineKeyframeGroup::allInvalidTimelineKeyframeGroups

These functions make it easy to find dangling/invalid PropertyChanges and
KeyFrameGroups.

Change-Id: I201a6561a51aba53405e8a8fc92821c467fecb1b
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>
2021-10-07 10:58:22 +00:00
Thomas Hartmann
50557abd03 QmlDesigner: Fix crash
If the target cannot be resolved the result is invalid.

Task-number: QDS-5216
Change-Id: Ibd7884d6638ae653953347862ca1291f963aa3b3
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2021-10-07 10:18:59 +00:00
Knud Dollereder
28b87ba4f4 Fix check if a key is supposed for deletion
Moved the function into timelineutils.h in order to be able to
use it from other places as well.

Change-Id: If5fa094abb6ae52d7922bc9bbcb96b482ece7ac0
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-10-07 09:46:57 +00:00
Cristian Adam
824b4db70c GitHub Actions: Update Qt to 6.2.0
Change-Id: I657838699d95adc48c1b5b9b8e091a53369890f7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-10-07 09:40:06 +00:00
Christian Kandeler
cd453a5c67 ClangCodeModel: Refer to clangd for the AST node under the cursor
The question which concrete AST node corresponds to a given cursor
position is surprisingly difficult to answer, and clangd already has a lot
of code for this. Therefore, we always refer to clangd to get a concrete
node, even if we already have the full AST.

Change-Id: I5d1528d776ee459a53b8e650a616ea7019ec59bf
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-07 09:36:49 +00:00
Thomas Hartmann
cfc732fe8f QmlDesigner: Remove all references also to children
If a node is deleted also children are deleted.
We have to remove all references to children, too.

Change-Id: Ie944b00ffc832fb0fb11ef0380c4b9b30add5757
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-10-07 09:22:21 +00:00
Robert Löhning
cbc9f4c4e1 Squish: Stabilize tst_rename_file
It takes a moment until the changed file appears in the project tree. A
context menu opened in that time may be in an unexpected state, so wait
until the renaming finished properly.

Change-Id: I6e1941083737b2df5855b9b0e61a973c99831304
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-07 08:56:06 +00:00
Robert Löhning
47cb2e9d24 Squish: Update and stabilize tst_rename_file
Change-Id: I1dae24e20d8c65b716dd988812eee013f0491603
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-07 08:55:50 +00:00
hjk
033d2c5cc3 Docker: create container before running image
Change-Id: Iea4a4ec446a2df6fc299be24615bca605fca83e9
Reviewed-by: hjk <hjk@qt.io>
2021-10-07 08:41:41 +00:00
Miikka Heikkinen
2a96c396f9 QmlDesigner: Notify other views of nodeSource triggered puppet reset
Use resetPuppet() instead of delayedRestartProcess() to properly
notify other views of the impending reset.

Fixes: QDS-5222
Change-Id: I46dc0dfc9f0b675bd2a0fc07c6b7d9cde4d1e48a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-07 08:28:34 +00:00
Robert Löhning
1cc4cbb402 Debugger: Tests: Fix warnings
To not confuse testers.

Change-Id: I2190e85cea5b0e32af883d8caa368aef0f55befc
Reviewed-by: hjk <hjk@qt.io>
2021-10-07 08:11:32 +00:00
Assam Boudjelthia
1e765e5963 Android: add environment to removeAvd()
Valid for windows hosts, otherwise, the command might fail.

Change-Id: I3e759c74ea0a785fd226cda08f301f0cce17c9b7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-10-06 18:50:55 +00:00
Thomas Hartmann
9491c04b8a QmlDesigner: Update TransitionEditor when animation is removed
Change-Id: Ida9c1a44879bd1d8d2bbf6614eda7d8b31de9037
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
2021-10-06 17:53:04 +00:00
hjk
2a0d09bdac Utils: Drop unneeded env parameter in searchInDirectoryHelper
Change-Id: I8134fe3f9306d8826b409771f60db36851613954
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-10-06 15:02:44 +00:00
Tim Jenssen
7d5c9be52b qmljseditor: fix crash at shutdown
Change-Id: Ifae7ec5f378c0b2d3e667bd26a509fbcbefadecf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-10-06 14:48:02 +00:00
Knud Dollereder
ee6f3a8cc8 Consider Qt::Key_Backspace and Qt::Key_Delete as delete keys
Both keys where set as a global shortcut for deletion.
The timeline considered only one of them.

Change-Id: I5d27221a371535e94751ffcd0f6d4420978d0f81
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-06 13:51:18 +00:00
Alessandro Portale
f3276a96e9 Wizards: Adapt QtQuickPrototype wizard to recent template changes
Handle the new isQt6 property.

amends: 77fed0b0fd

Task-number: QTCREATORBUG-26373
Change-Id: Iff6fb8f91954aa116b8f1c461c7db45f321325fd
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-10-06 13:21:33 +00:00
Artem Sokolovskii
d02155f24a ClangFormat: Fix bug with reload of settings
- Fixed behavior when saved data from file doesn't load
in the first opening of the code style options

Change-Id: I1c72845cbf8119f9eb402a2f40bcc816c5590c25
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-10-06 13:17:04 +00:00
Christian Kandeler
25a7f30ffc ClangCodeModel: Do not hold highlighters by value in ClangdClient
Semantic highlighter objects are owned by their respective documents, so
we can run into destruction issues when keeping them by value.

Fixes: QTCREATORBUG-26364
Change-Id: Idc128d685ccdd25989dd9389d352453ccc935fa9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-10-06 12:03:08 +00:00
Eike Ziller
9ca3546e59 Fix that ".." was no longer cleaned in file system locator filter
Amends 66bf957618

Fixes: QTCREATORBUG-26368
Change-Id: I0b90b1a6b6d4bd1bdbf135f0447702d6a85bb9e4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-10-06 11:43:27 +00:00
Eike Ziller
d63b8b0bb7 Fix that tabs where replaced with ? in search results
Looks like tabs are not "print", so make sure that whitespace is kept
unmodified.

Amends 1aa92b5dab

Fixes: QTCREATORBUG-26367
Change-Id: Ie9a89b36440c51ef2bbcf7a668f3c9b5f3c0f485
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-10-06 11:43:20 +00:00
Jarek Kobus
7e7b6a52f9 Don't kill the QProcess instance which is running in other thread
The main thread doesn't kill processes directly, but
sets just the cancel flag.

Instead of waiting infinitely long for a process to finish
we poll periodically (every 100ms) for the canceled flag
inside the thread that started the process.

Amends: a30aa4421a

Task-number: QTCREATORBUG-26333
Change-Id: I599d5c6cd69381cadc4a01c65f6a79f9a9bbd3fb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-10-06 09:57:37 +00:00
David Schulz
704a758f69 Docker: use PathListEditor for mounts
Change-Id: I5ed0ebf5ecdad17c1800f15906063d3413307da3
Reviewed-by: hjk <hjk@qt.io>
2021-10-06 09:57:02 +00:00
David Schulz
0f480cee70 Docker: allow windows style paths in settings
Makes sure to convert it to unix style path on the target and use the
correct capitalisation on the host

Change-Id: I0c6dff47c34c1844a8198c3215ea857fdb6375c7
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-06 09:56:53 +00:00
Christian Kandeler
372b0c9b7e ClangCodeModel: Handle clangd's semantic tokens in parallel
This speeds up semantic highlighting considerably.

Change-Id: I1dca2c8d6b9e41ac2895a53b795466a3249f79bc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-06 09:45:26 +00:00
Eike Ziller
9dd6b59983 Bump version to 5.0.3
Change-Id: Iba72b6b0ff1d13a35b6d7473b0617ecb80afa164
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-10-06 08:37:22 +00:00
Tim Jenssen
6860e361a4 qmldom: fix output path
Change-Id: I137accdb788fa4686a0c70dfcc1b66a6c576dcff
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-10-06 08:15:19 +00:00
Assam Boudjelthia
c94d5a257b Android: few fixes for android kits aspects
Make some changes to make Android kits behave as, for example,
desktop kits:
* Set the build device of the kit to the default desktop device.
* Don't make the device and toolchain aspects sticky.

Change-Id: I41a40c6ed8dc3434fa4f3a09349b75b5fd379317
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-10-06 08:08:05 +00:00
Assam Boudjelthia
91117a1c36 Android: Clean up for extraData constants
clean, rename and delete unused constants, we well as unify the
usage between qmake, cmake, and qbs.

Change-Id: I8827ac2f2f7660e337694fef17f744e727bd776a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-10-06 08:07:42 +00:00
Christian Stenger
b7815a4187 Docker: Use shell if possible
Using the shell for short running processes that do not
modify the container environment is recommended as it
avoids starting up another process.

Change-Id: I32a1f348bfa56ee4094599cff1af17525a6d2a98
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-06 07:26:47 +00:00
Artem Sokolovskii
8b263b4ae5 ClangFormat: Rework clangformatconfigwidget
- Move logic work with clang-format file to
additional class to make clangformatconfigwidget
responsible only for work with ui elements.
- Fix functionality: when new BasedOnStyle was
chosen all fields were empty or set in default,
now it fills with the corresponding value.

Change-Id: I2ee42a502e87da761274d293a7f0a38fda98804d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-10-06 06:59:17 +00:00
Thomas Hartmann
ec74c36a8c QmlDesigner: Fix foreach
Change-Id: Iccad64883b166d8f8ece4422b504064e5bb1651c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-05 18:07:17 +00:00
Eike Ziller
8cd00498c3 Merge remote-tracking branch 'origin/5.0' into 6.0
Change-Id: I0667f8a4f4376569ea8458399e711c28d8ba02b3
2021-10-05 16:10:52 +02:00
Miikka Heikkinen
6c3310f450 QmlDesigner: Fix implicit component clearing logic
The logic didn't account for custom parser nodes, which were
incorrectly detected as former implicit components needing clearing.

Fixes: QDS-5223
Change-Id: I026d5530082de9c6f23b3b0f2b28df2d08c9ac03
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-05 13:33:38 +00:00
Cristian Adam
89d0239cd8 CMakePM: Do not treat generated source files as project source files
Also mark the CMake configured generated precompile header files as
generated, so that the "Hide Generated Files" filter menu entry would
take them into account.

Fixes: QTCREATORBUG-25125
Change-Id: I0ec1cc923e361ae9b599eef1a039695e749a033a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-10-05 12:41:16 +00:00
Leena Miettinen
53a4bc3544 Doc: Document particle system component properties
Fixes: QDS-5040
Change-Id: I47f0f159c1eb15cb6fbeb001fcb5987b5f430d0e
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-10-05 12:14:11 +00:00
Mahmoud Badri
54459aaef6 QmlDesigner: move 3D assets category to the right place
Change-Id: I7c16dd687081646942b9fb45c608625ff02aa1da
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-05 11:49:45 +00:00
hjk
04f6f6bbc0 CppCheck: Use more FilePath
Change-Id: I45da67df4b76032303b57f567d73ae01bf9f2e91
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-05 11:25:40 +00:00
hjk
cc8d65aa25 Debugger: Use FilePath in CdbSymbolPathsListEditor
Change-Id: I8935284cf3712903660f61cd06083d4da6f1c7c2
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-05 09:45:50 +00:00
Christian Stenger
bdb7aed82e QmlDesigner: Fix compile
Amends e0611c0cfa.

Change-Id: I5bea935b8f6cd9e86c028d066a7b8775b10c06c7
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2021-10-05 09:43:21 +00:00
Christian Kandeler
2641c2514e CppEditor: Add timing information for semantic highlighting
Change-Id: If53fd8c8895916a613629628b4555983c0d76ce6
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-05 09:13:39 +00:00
Christian Kandeler
221eb6def0 ClangCodeModel: Add infrastructure for collecting timing data
... and use it for highlighting with clangd.

Change-Id: Ib082c0b80593a2115f9cc19ee8279b17187e9309
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-05 09:12:54 +00:00
Miikka Heikkinen
2ab6f800b3 QmlDesigner: Fix issues with Components and Repeaters
- Fixed state preview rendering by deparenting nodes under
  component wraps.
- Ensure state preview image is always clipped to root item.
  The state preview bounding box broke when Repeater was direct
  child of root and had delegate with rotation.
- Allow dragging items under Repeater to create implicit component.
- Allow dragging Components under Repeater.
- Do not ask for target property when Component is dragged under
  any node.
- Update nodeSource properly when reparenting implicit component
  or removing last child of a Component item.
- Fixed scene update when last child of a repeater is deleted/moved.

Fixes: QDS-5197
Change-Id: Iaaf1745e25db3522ffc1dba7fd1b051da29f5aec
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-10-05 09:12:12 +00:00
Miikka Heikkinen
4036c20f63 QmlDesigner: Add Loader and Repeater to component library
Also fixes some issues with Repeater usage.

Fixes: QDS-5149
Change-Id: I259dcb73be634150dd0c5e602165b63112ec958c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-10-05 09:11:59 +00:00
Christian Kandeler
545da2f6a6 ClangCodeModel: Improve collection of highlighting info from AST
... with clangd.
- Turn function with lots of lambdas into a class.
- Traverse the AST without repeatedly modifying a list in a tight loop.

Change-Id: I46668a4df672c00cbd7b1a562ae94a6db4cbd2fc
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-05 09:11:45 +00:00
Miikka Heikkinen
e0611c0cfa QmlDesigner: Add support for Component type
Component type is added to Component Library and can be dragged to
the scene. Items under the component are not shown in the scene.

Fixes: QDS-5093
Change-Id: I0c80647e73124866a8b772022a761ca6cbb545a1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-05 09:10:16 +00:00
Jarek Kobus
9e5744b1f3 Remove unneeded include of QAbstractProxyModel
QSortFilterProxyModel, which we already include and use here,
is derived from QAbstractProxyModel, which we don't use here.

Change-Id: I896f27d25cc75e73a7f97b82657fad648ef0ab99
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-10-05 09:06:45 +00:00