Commit Graph

70777 Commits

Author SHA1 Message Date
Christian Kandeler
e454c91838 QmlPuppet: Fix qbs build
Amends b8b6af0dbb.

Change-Id: I5ef8c58fec1ccdf4b620969c07a2134818b82f1c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-08 12:18:03 +00:00
Christian Kandeler
3ee484332b Fix qmake build of qbs
Change-Id: Ia59128fd3f37a73071bcefacd4163f3e997c7744
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-10-08 12:17:45 +00:00
Jarek Kobus
a7b9ee22dd Optimize resetOptimalWidth()
Don't call this method directly on every demand, but schedule
a call instead and invoke it once after the current call
returns back to the main loop.

The single call may cost up to ~20ms, and when we call it for
every target having 5000 targets, the total cost is up to ~10 seconds
(every call removes one items, so subsequent calls take a bit
less time). This happens on shutdown when Qt6 project was loaded.
The shutdown time went down from ~15 seconds to ~4 seconds with
this patch.

Change-Id: Id821d72cd8e1dd949112d9167b7736a267b221fc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-10-08 12:09:25 +00:00
Jarek Kobus
de3e33a76b Optimize setupLocationInfoForTargets()
Don't search for each target separately in the node tree,
but do a one search for all targets at once.

This makes searching for nodes much faster, as in case
of loading a Qt6 project (5 main modules only) with debug build
of Creator, the searching time went down from 36 seconds into
30 miliseconds (just 1000 times faster). The number of targets
in this case was more than 5000.

Change-Id: I015f6fd2a2d5e613307cc7b65746c01a5b14c6dc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-10-08 12:09:20 +00:00
Eike Ziller
2adec9274e Update change log for 6.0
Change-Id: Ic75aabfe80b69f9e50f97dc516cda05787fcd94a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-10-08 11:50:20 +00:00
Mahmoud Badri
56de449b17 QmlDesigner: Add dropped 3D models to the 3D Editor
When dragging 3D model file(s) from the file system and dropping them
on the 3D Editor, add the models the the 3D Editor after importing
them.

Change-Id: I51ec945097a19e8895eb599b898d49e879100b6d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-08 11:13:19 +00:00
Thomas Hartmann
8770c8674d QmlDesigner: Delete animations if target is deleted
Task-number: QDS-5221
Change-Id: I98d1a370bf73ef298d3f309d0129b85e2147de6a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-10-08 08:07:07 +00:00
Assam Boudjelthia
df904decd0 Android: correct label for build platform sdk in project settings
The current label could be confused with build-tools version, so make
it more explicit.

Change-Id: I96abe9af04e6a6e8518926578411f759b90fc9a0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-10-08 06:52:57 +00:00
Ivan Komissarov
21a90d5332 Update Qbs submodule to the top of 1.21 branch
Change-Id: Ic97122e5b029ce854b24c641b764ea9910e3a2e4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-10-07 17:20:41 +00:00
Alessandro Portale
0786e967dd Core: Prevent contents of Popups being styled as "panelwidgets"
Content of widgets with windowType Qt::Dialog was already excluded from
being styled as "panelwidgets". This change adds Qt::Popup to the
blacklist.

Task-number: QTCREATORBUG-26370
Change-Id: I76d07da4d8f3ae9f1c8235cdc072a04917454065
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-10-07 16:06:07 +00:00
Eike Ziller
19b59f88d2 Fix that .ui files could be opened in C++ editor
The glob "*.ui" is unfortunately not unique in the mime database, so it
falls back to using the mime magic to determine the mime type.
That process is unfortunately defined by the "standard" in a most useless
way: Even if a mime type matches both by glob and by mime magic, a mime
type that does not match by glob can be preferred, if its mime magic
matches either with a higher priority, or with the same priority but is
alphabetically "smaller" than the other mime type.

Reduce the priority of the "#include" mime magic for the text/x-c++hdr
mime type, so it is lower than the mime magic of the application/x-
designer mime type.

Fixes: QTCREATORBUG-21773
Change-Id: Idfb9ab509c13563b50381b098d643f6fa9292f27
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-07 15:51:20 +00:00
Christian Kandeler
5156c8b510 ProjectExplorer: Fix unsafe kit removal procedure
We iterated through a list that was in the middle of a std::remove(),
which is not safe.

Change-Id: I2b4bce18ebe3365fd22f33521aa82868c10e9647
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-10-07 15:21:16 +00:00
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
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
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
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
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
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