Commit Graph

72643 Commits

Author SHA1 Message Date
Thomas Hartmann
4ed637d8da QmlDesigner: Do not allow baseState as id
Using this as id will lead to bugs.

Change-Id: I76997a31e290e0cd67688fecdb1e9521c88481da
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-03-23 08:50:16 +00:00
Christian Stenger
34b94d8cd2 Squish: Update Welcome page test
Change-Id: I447addcba50e932886a8ed5e730a1eab663a2224
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-23 05:37:42 +00:00
Tim Jenssen
0f7a4484d0 qds: disable crashpad with universal builds
Change-Id: Iafb1264bfc6b669fd327b052d39ae97c12e329b4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-03-22 21:09:59 +00:00
Thomas Hartmann
e33150d7b2 QmlDesigner: Fix DirectoryFontLoader
It was not using the new folder structure.

Change-Id: I9ab87ac32dfce203defe7c914f3091121bb6f549
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-22 17:03:54 +00:00
Henning Gruendl
f14c9d88e1 QmlDesigner: Add placeholder functionality
Add placeholder functionality to StudioControls TextField

Change-Id: I2a6659a40effbc04c42d80a218c0bd70e0b3343f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-22 16:42:03 +00:00
Henning Gruendl
0c7ec14c62 QmlDesigner: Fix WindowSpecifics for Qt6
* Duplicate WindowSpecifics.qml and move it to QtQuick referencing the
  original from QtQuick/Window as the import changed in Qt6
* Add missing properties to the original specifics: position,
  minimumWidth, minimumHeight, maximumWidth, maximumHeight,
  contentOrientation, flags, modality, visibility

Change-Id: I542f94b153172d4c7b5a2c62ad0abdc53b8bd1fd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-22 16:40:44 +00:00
Thomas Hartmann
fe711ebce4 QmlDesigner: Parse .metainfo files from the share folder
We have some plugins that essentially only contain a .metainfo file.
the possibility to drop .metainfo files into that folder simplifies things.
In QDS 3.2 this will be used for the particle library.

Change-Id: I0c4bb7f66bb8eaa3f806ec9d34c6991d08ef5a5f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-22 14:39:27 +00:00
Samuel Ghinet
635d6bab0f QDS New Project dialog: Rename NewProjectView.qml to PresetView.qml
Change-Id: I5f129a53404bfb80e3e11f9d73754674f3693952
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-22 13:41:49 +00:00
Samuel Ghinet
9c5f390aa8 Qds Project Wizard fix: cannot select style
This bug was caused by QDS-5741: Use hover states for interactive items

Task-number: QDS-6470
Change-Id: Ice12374257645e39a6c488c30ab584636ba52e9a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-03-22 12:06:12 +00:00
Eike Ziller
22c67db406 Fix double-clicking in Projects view to open file in extra window
When you have an external editor window open (Window > Open in New
Window):

- make sure that the editor has focus in the main window
- switch to the external window
- double-click a file in Projects, Open Documents, or File System view

The file is supposed to open in the external window.
The problem is that clicking into e.g. Projects view activates the main
window, which changes focus, and the current editor.
Something changed in the event order in Qt (also Qt 5), so the existing
workaround that delayed setting the current editor view in that case by
just one event loop cycle doesn't work anymore. Delay be the double-
click interval instead, so the double-click can be processed before the
main window's editor view is made current.

Fixes: QTCREATORBUG-26773
Change-Id: I56efd5a50a8bb986563c8c15d340756dace06494
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-22 11:52:10 +00:00
Thomas Hartmann
70c44acdd8 QmlDesigner: Fix itemlibrary template generation
Since this is likely executed in a transaction and
newQmlObjectNode.setId() uses refactoring on the QML code
this is not working as expected. Setting the id without any refactoring,
that triggers changes of the QML code, is save to be used.

Change-Id: I5d29689eff34827de9e451f433d9a4b42569a64e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-22 11:50:23 +00:00
Assam Boudjelthia
2846bef563 Android: fix logcat retrieval on pre Android Nougat
Logcat on pre Android Nougat (API <= 23) was broken because the the
returned output from the adb command had lots of null characters \u0000
in the string, and thus the comparison against the deployed package
name was failing and the pid was always -1. This makes sure to remove
any null characters before the comparison and simplifies the code a bit.

Task-number: QTBUG-101673
Fixes: QTCREATORBUG-26732
Change-Id: I3f185eceab376dbb0f4f11cf628b71e058ee5583
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-22 11:42:11 +00:00
Christian Kandeler
137d3367cf CppEditor: Do not crash on doxygen comment creation
... for templates that were not parsed entirely successfully.
Amends a437539096.

Fixes: QTCREATORBUG-27207
Change-Id: I4d7935b30cac9ce14f442977d07417a343ecae11
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-22 11:01:18 +00:00
Thomas Hartmann
638b93591b QmlDesigner: Remove unrequired event filter
This event filter was introduced because other wise
actions in QML like CTRL+C or CTRL+UP were intercepted
by QWidget::QAction. With Qt 6.2.x this workaround is not
required anymore.

Change-Id: I43a84ae13cca58840afacabe85c36c5f2235cf39
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
v7.0.0
2022-03-21 13:58:58 +00:00
Thomas Hartmann
675875c3b4 QmlDesigner: Block more imports
Change-Id: I839fb320df61bad0a39ff98e1274201f5a99a8ed
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-21 13:58:37 +00:00
Samuel Ghinet
fb1c6fbfe2 Qds: New Project dialog in new Welcome screen should close on Esc
Task-number: QDS-5697
Change-Id: I26f2e65bbb98b15b3867e0774a1bf8f78409b430
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-21 13:34:02 +00:00
Cristian Adam
a1929bd9d7 ClangCodeModel: Add some more timing debug information
By setting QT_LOGGING_RULES=qtc.clangcodemodel.clangd.timing=true I can get
values like:

qtc.clangcodemodel.clangd.timing: highlighting: Start to end: 2953 ms
qtc.clangcodemodel.clangd.timing: ClangdCompletionAssistProcessor took: 7343 ms

The first tells you how long Creator took to turn clangd's semantic tokens into
full highlighting info, and the second how long it took for Ctrl+Space.

Change-Id: I99bd04c2889bb7da98c04537eab06d6ed6117167
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-03-21 12:40:33 +00:00
Mats Honkamaa
047253b6a8 Doc: Add information about visualization of emitters and attractors
Task-number: QDS-6370
Change-Id: I7c9e2a03b025d16769ed7cc4f3da85fe91193321
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-03-21 10:38:47 +00:00
Henning Gruendl
f347623804 QmlDesigner: Add missing StudioControl in qmldir
Change-Id: I5bbe66b306b0a947256533050a98fc0e4671774f
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-21 10:14:43 +00:00
Robert Löhning
a2735ec024 Squish: Don't configure projects on Qt4 anymore
Change-Id: Ib09fc44323e09fa4d6a5d2428c35b5b6afe08f24
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-18 18:27:32 +00:00
Christian Stenger
4e47ed66c9 Squish: Fix qml indentation test
Adapt to default build system change.

Change-Id: I70b5869871d4fbb612d4b6a28beb5e73c2d8d88e
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-18 14:39:56 +00:00
Christian Stenger
de1a328390 Squish: Fix debugging console app test
Change-Id: I752dab65948952081752a805018cfc3b01193855
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-18 14:39:49 +00:00
Christian Stenger
7012aa621c RemoteLinux: Allow open remote shell from Windows as well
Was originally restricted to UNIX hosts, but works for Windows
as well.

Change-Id: I233ec73760134256723a927de5e9e6cc9aefa8ac
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-03-18 14:39:30 +00:00
Robert Löhning
48c3a02229 Squish: Update suite_QMLS
Change-Id: I2cf804362b965be77ff0cd6686c998664e6eee02
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-18 12:57:08 +00:00
Robert Löhning
59c32bcfbe Squish: Don't use Qt4 in tst_HELP04 anymore
Change-Id: Idebff8b0bfd75daf573ab870dedd984eac9d09d0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-18 12:56:31 +00:00
Miikka Heikkinen
10f2fb7be2 QmlDesigner: Don't scan for fonts if resource path is not valid
For some reason captureiconmode puppet is launched at QDS shutdown,
with empty resource path. This caused the entire drive to be searched
for fonts to register, making the puppet linger for up to a minute
after the shutdown.

Fixes: QDS-6482
Change-Id: I0f1fa4b6f5646c76d93f5820dae029033e1543a3
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-18 11:27:35 +00:00
Thomas Hartmann
1651efaee7 QmlDesigner: Hide puppet building unless showDebugSettings is enabled
Change-Id: I9c437bcbf4e4a255fd5ed81852f53d0a46dbcf1f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-03-18 10:36:30 +00:00
Thomas Hartmann
44f7bf09b5 QmlDesigner: Clear errors when starting the puppet
Change-Id: I25d163ae48d094d6e7ba5059f7832d1b48ffec65
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-03-18 10:35:28 +00:00
Thomas Hartmann
8867fd2a9b QmlDesigner: Quailfy library and directory imports
This unifies the behavior with the TextToModelMerger for consistency.
When parsing QML documents the types are already qualified in the same way.
The plan is to use NodeMetaInfo also in the TextToModelMerger in the future.

Change-Id: I046f39d87f1be0506740e3a4afdfbff9b13eca4b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-18 10:35:00 +00:00
Eike Ziller
b303afa4ec Fix black text in Search Results toolbar
In case the LicenseChecker plugin is enabled. That runs some event loop
during initialize() and it looks like that somehow leads to a wrong
palette for these two, at that time parent-less widgets.

Creating the widgets at a later time, just before they are added to the
toolbar, helps.

Fixes: QTCREATORBUG-27200
Change-Id: I00dc9c8981a0572d7b9f726ec870eb2afb188cc1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-18 10:26:30 +00:00
Robert Löhning
689d3d528e Squish: Update tst_CSUP01 and -02
Change-Id: I6e15545be1a92e43b5708dc5fdef456b8d2ab32d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-18 10:02:00 +00:00
Miikka Heikkinen
ce8c578b20 QmlDesigner: Center the add new state button plus sign
Fixes: QDS-6399
Change-Id: I8ed23363fbe8bc09fe8e6825dce096fcc664f6bb
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-18 09:59:34 +00:00
Mats Honkamaa
9e3945e45f Doc: Update States view docs
- Updated images
- Converted jpg images to png
- Updated instructions

Task-number: QDS-6186
Change-Id: Ibaee1acd11881c49d272e9c41e11b729e3c951ec
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-03-18 09:33:45 +00:00
Jarek Kobus
7c39617324 Make the setup info visually more noticeable
By adding two leading newlines we separate it nicely
from the other part of the test log.

Amends 66c5b1e11e

Change-Id: Ic260cdc4cc2421ddb04bc5027082521800b268e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-18 08:55:42 +00:00
Jarek Kobus
481df466e2 Fix FileSystemAccessTest::testFileActions() flakiness
Always add " > /dev/null 2>&1" infix so that the
output of e.g. "rm" command, when failed, is redirected
to dev/null.

Enclose the input data in runInShell() with quotation
marks and escape all the characters in passed data
accordingly. Pass the "-e" option to echo in order to
turn on the escaping mode.

Add a new test for testCreateRemoteFile().

Change-Id: I7db07b57035242279cac7dd77a80ac6dd05bfb1f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-03-18 08:36:59 +00:00
Miikka Heikkinen
de8a67a412 QmlDesigner: Add drag support to empty asset library placeholder item
Fixes: QDS-6430
Change-Id: I561f4ed51ccb1e47472adb9baa6e5594eb93eafb
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-18 08:24:04 +00:00
hjk
a23c4ce014 Docker: Fix searching compilers in custom directories
Previously, detection (mostly) only used path.

Change-Id: If382205c2ff39cabfe21953e877e152dc952a84c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-18 08:21:51 +00:00
Miikka Heikkinen
c865481068 QmlDesigner: Add particle attractor visualization to 3D editor
Particle attractors are visualized similarly to particle emitters,
except that they are shown as blue instead of yellow when parent system
is active.

Fixes: QDS-6426
Change-Id: I085727dac7f3b4fa968e313b78db3f476941a7da
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-18 08:17:37 +00:00
Miikka Heikkinen
d6718fa838 QmlDesigner: Remove unnecessary import dialog for complex assets
Also remove target folder highlights for dragged complex assets.

Fixes: QDS-6433
Change-Id: I499da9444e9f153672fb38b66a6841fb6035cbbd
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-18 08:16:24 +00:00
Robert Löhning
ab772c50be Squish: Update tst_cmake_speedcrunch
Change-Id: I46ab6f245a21546e6ebf20680f06b0cdd26eab8f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-03-17 21:35:44 +00:00
Thomas Hartmann
e3babb235b QmlDesigner: Bump version number in wizard template
Change-Id: I2e9dc5863a4f8eacb5f9b258ea0744ad051242f9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-03-17 15:40:45 +00:00
Alessandro Portale
e45e16d904 Android: Make the device watcher process terminate on shutdown
Terminate on IPlugin::aboutToShutdown instead of
QCoreApplication::aboutToQuit. If needed synchronously.

Added "ADB device watcher started" logging.

Fixes: QTCREATORBUG-27118
Change-Id: I483659b018c74d179b64a5a4f17cc2c27c9598a8
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-03-17 15:12:55 +00:00
Miikka Heikkinen
68d30df703 QmlDesigner: Add some basic on-drag property bindings for particles
Dragging Particle3D based items from component library will highlight
particle emitters for automatic property binding. Similarly,
dragging particle shapes will highlight emitters and attractors for
automatic binding.

Change-Id: I0e5a8d066beaa6d84e8665e7ae985287de32ceea
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-03-17 14:50:57 +00:00
David Schulz
519804a0d2 QmlJSEditor: prevent possible crash on font settings change
Fixes: QTCREATORBUG-27116
Change-Id: Iac38bd4ef20e739da4c4b8b1c072fd2cd648a66a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-17 13:55:10 +00:00
Assam Boudjelthia
03abdcda9f Android: don't fail if device abi list is empty
If for some reason the device abi list is empty, don't stop the
deployment, let it continue and potentially fail later.

Amends c1512dce87.

Task-number: QTCREATORBUG-27103
Change-Id: I484fbd1ddb365d5e96686eebc3ba76032684e506
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-03-17 09:21:10 +00:00
Eike Ziller
be0c2600f8 DirectoryFilter: Fix missing file entries before first refresh
After re-starting Qt Creator, the filter was reading the file path cache
from the settings, but it didn't set the corresponding file iterator
that is used when actually invoking Locator.
That lead to the files only being available after the first (automatic)
refresh after a few minutes of Qt Creator running (depending on
settings).

Fixes: QTCREATORBUG-26381
Change-Id: I819961ad3b146d339e760f6648b8b01f437040f7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-03-17 08:47:15 +00:00
David Schulz
976653cd93 QmlProjectManager: fix crash
Fixes: QTCREATORBUG-27190
Change-Id: I188930f6e5cca5d32a91e9c6ce8ca6a798273bf2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-17 07:28:49 +00:00
Christian Stenger
a42b63ac05 Squish: Build speedcrunch with Qt5
Change-Id: I1fe79d6775b157fda26248917c9489edca88fd53
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-03-17 05:27:13 +00:00
David Faure
25d70414ab Improve item model templates
* Add missing "return true" in insert/remove Rows/Columns
* Use C++11 syntax for a vector of ints containing just "role"
* Make items not only editable, but also enabled+selectable, as expected
  by default

Change-Id: I8ed529d2534a495f2c924906fe51ada474f9347e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-03-16 21:33:04 +00:00
Alessandro Portale
c170e4fa57 Android: Use const & in a range-based for loop
Change-Id: Ib769d5133383ed30717e479107b6a74c53b72a58
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-03-16 18:33:25 +00:00