Commit Graph

80529 Commits

Author SHA1 Message Date
Thomas Hartmann
397126a0db QmlDesigner: Add iconFromName to Theme
Change-Id: I4d7a18a9e2e6a8e4acb3c2d9940c5624cf0f6f96
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2023-01-31 10:58:38 +00:00
Thomas Hartmann
051cff8222 QmlDesigner: Set contents margins of curve editor to 0, 0, 0, 0
Change-Id: I3f87f60ae07c3ae6619b345fb6e4ab356344d066
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-01-31 10:47:10 +00:00
hjk
50ee70fcee RemoteLinux: Remove AbstractRemoteLinuxDeployService::setDevice
Unused now.

Change-Id: I53ec97026e49435d1ca84b4f925e82c233853a8f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-31 09:58:28 +00:00
Amr Essam
179d7e2e9a QmlDesigner: Fix delete effect asset crashes the puppet
Current solution is to keep the effect qml not deleted, and delete only
the qep asset, because it's not possible for performance reasons to
scrape the ui qml files for the effect usages and remove effect imports
and elements using it.

Task-number: QDS-8880
Change-Id: I82d21cdd2f2569eda50d2eeeb6302a6258c57e0e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-01-31 09:20:39 +00:00
Alessandro Portale
97002f934f QmlProjectManager: Fix the "Qt Quick UI Prototype" wizard
The wizard uses the the same main.qml.tpl template as the "Qt Quick
Application" wizard. That file was renamed to Main.qml.tpl.

Change-Id: I7978cd2a09da7aa70a75f9cc5cb6e7b6dcdff058
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2023-01-31 08:33:17 +00:00
Christian Stenger
ad5460e5f5 Squish: Fix cancel handling
Remove canceling as state as it never had been used for real.
Keep the canceled state instead of overwriting it with finished.
Canceled has internally anyhow the same meaning as finished,
but we need the information whether the process had been canceled
or not to handle secondary runners like the recorder correctly.
Fixes canceling a run or a record.

Change-Id: I20ff6bc1b1d0b969c19940f763411e26149b3d16
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-01-31 08:12:03 +00:00
Orgad Shaneh
7dc1e2031f MarketPlace: Avoid needless copy
Reported by Coverity.

Change-Id: Ied6f7f6cd8cf295ea39ee813e38cf19585c9dcc2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-31 08:05:19 +00:00
Ali Kianian
6c314747be QmlDesigner: Apply Icon for "Merge with Template" item in context Menu
Task-number: QDS-8912
Change-Id: I2459af64e0d313a56486fbd541000b917d46fea3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-31 07:00:28 +00:00
hjk
ec43a6c005 QmlProjectManager: FilePathify further
Change-Id: I8d83cc93778f8786c30e0aaef459c51005139b19
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-31 06:50:54 +00:00
Fabian Kosmale
fa2ea6fd97 QtQuickApplication template: Support more modern API
(Re)add a way to select the minimum supported Qt version. If it is >=
6.4, connect to QQmlApplicationEngine::objectCreationFailed instead of
objectCreated, getting rid of the status check.
Moreover, if we have Qt >= 6.4, also use qt_standard_project_setup
instead of manually enabling AUTOMOC. That is available since 6.3, but
no need to clutter the version selection list with too many entries.
If only 6.5 or higher is required, put the QML files under
AUTO_RESOURCE_PREFIX, and use loadFromModule instead of load.
Unconditionally rename  main.qml to Main.qml, which is necessary for
loadFromModule to work, and making this conditional on the used Qt
version is more trouble than it is worth.

For qbs, we do not yet put the files under the auto resource prefix, so
do not use loadFromModule there.

Fixes: QTBUG-47996
Change-Id: Ib8ca375c2316b58eecf54009d36fc9f7dac7c1f4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-31 06:38:19 +00:00
Andre Hartmann
86ffc29239 Git: Avoid passing strings to resolve text encodings
Therefore, merge the code of codecFor() and encoding()
to avoid further mis-usage.

Change-Id: I086e4ace6c791d16f43f14c423b6529ad199c456
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-01-30 17:51:47 +00:00
Orgad Shaneh
7cd4c295c7 CppEditor: Initialize member in GetterSetterRefactoringHelper
Reported by Coverity.

Change-Id: I0b6a1a36a33fe9b1cd81d2b314c80f42054d3d11
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-30 17:09:23 +00:00
hjk
92b23cb827 Nim: Use simple wrapper classes for project generation
This allows a setup similar to the run and build related items
and a slimmer header file.

Change-Id: I76c722fb2a3022b11ecbc13456be39288fce868b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-30 14:13:55 +00:00
Brook Cronin
9ed9e466f7 QmlDesigner: update icon font
Change-Id: Ib26c9253ff012845e806a68be20d292c22e292ee
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-30 13:59:36 +00:00
Tasuku Suzuki
8cb0858574 Improve console app template
Set QtCore explicitly instead of removing QtGui from default modules.
Update CONFIG with the new feature introduced in QTBUG-27079

Change-Id: Id2b5cc7c9534618b88c4683253af6c2a8fd90816
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-30 13:47:32 +00:00
Tasuku Suzuki
2f94e93334 "New Class" wizard: Add QML_ELEMENT checkbox
Change-Id: I219b539ba5f36c895be1042a74571e54a0c67ec6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-30 13:46:49 +00:00
Christian Stenger
2afe3a6ff2 Squish: Fix object map handling
Always assume UTF8 content. Fixes unicode handling
of object names.
Kind of amend b55c10f189.

Change-Id: I5259ebed6e7eb142408ee8645fed4b0ab1460d19
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-01-30 13:45:55 +00:00
Christian Stenger
3c51f499ac Squish: Fix perspective handling
We always expect a perspective mode when starting the
squishserver.
Fixes writing the server configuration which worked
coincidentally before as it had been still in Query
mode but broke when separating runner and server into
own classes.

Change-Id: Ia2a986fb0f10bd2b3125916d3113f850db7f156a
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-01-30 13:45:50 +00:00
Alessandro Portale
0a30b8aa26 QmlProjectManager: Fix Qt Quick UI Prototype wizard
Fix the path to the main.qml template. Remove all Qt version quirks,
since "Qt Quick Application" project wizards are for Qt 6 from now on.

Amends: 4e0b4fcc92

Fixes: QTCREATORBUG-28722
Change-Id: I338f52f215afc8591fadb12c2ad3ca58d32ec7c7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-30 13:39:19 +00:00
Samuel Ghinet
8bb6d0936d QmlDesigner: Do not show file size for directories
Task-number: QDS-8877
Change-Id: I4d4e8a76f65f2b8eebf77e391bd0c499ed49f7c8
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-01-30 12:35:44 +00:00
Andre Hartmann
61fab0b736 Git: Fix instant blame text encoding
Fixes: QTCREATORBUG-28728
Change-Id: I875488badc84b664eaa1223b37657dcb417157de
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-01-30 12:32:03 +00:00
Christian Stenger
04f521abcf CompilationDBPM: Adapt to FilePath change
Change-Id: Idc2987e0568d34cf024cb170aa604f47053c9617
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-30 12:20:20 +00:00
Christian Kandeler
803ecca075 ClangCodeModel: Fix soft assert
Amends 0d909c353c.

Change-Id: Icb0c7245825fc7e8c4ce1ac3fae1bc585e857ace
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-01-30 11:57:39 +00:00
Samuel Ghinet
7ccd8eb295 QmlDesigner: Make the selected style appear selected even when hovered
In the New Project dialog, when browsing thorough the Styles, the
border of each style becomes white on hover, and when selected, the
border is blue. When a Style item was both hovered and selected,
though, the border was shown as white (i.e. highlighted). It should
be blue (selected) instead.

Task-number: QDS-8875
Change-Id: I4573ff57b7b5561f17f1fe6adf3fa214a62d5538
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-01-30 11:26:10 +00:00
Orgad Shaneh
b05ec7dc3c AutoTest: Avoid pass by value
Reported by Coverity.

Change-Id: Ic0ec726ab4ec1ed96b7f4ca95a6e7dc462baeda2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-30 10:32:40 +00:00
Christian Kandeler
06390f5b53 CppEditor: Warn against renaming in generated files
Task-number: QTCREATORBUG-7044
Change-Id: I3ab2bafb1a7333d8c1a49dcd795696085ac6f666
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-30 09:48:57 +00:00
Mats Honkamaa
afb3ceb430 Doc: Update QQEM effects topic
The way you work with QQEM effects in QDS has changed.

Task-number: QDS-8704
Change-Id: Ib5c4dfc0adedb7174f9bc7df640bfb686e56978d
Reviewed-by: Ville Varanka <ville.varanka@qt.io>
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-01-30 09:03:36 +00:00
David Schulz
4e8b7eee9d Cpp: support space ship operator in lexer
Fixes: QTCREATORBUG-27503
Change-Id: Idbff5a9b5b2e6e841e298ca6f706ef3c6aa1622b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-30 05:47:41 +00:00
Jussi Witick
c780151aec Add Qt Safe Renderer helper plugin
Initially this plugin will include Qt Creator project wizards
for Qt Safe Renderer

Task-number: QSR-1874
Change-Id: I3831c875469439ae9576aabd51af050b6af959cf
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-01-30 05:15:42 +00:00
Thomas Hartmann
bf4da951ad QmlDesigner: Enable example data download
The download was not enabled anymore.

Task-number: QDS-8959
Change-Id: I3d95f21d3da458627b22327432388e8f80b97c71
Reviewed-by: Tanja Remes <tanja.remes@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-27 18:36:40 +00:00
hjk
e3f6eca25d Utils: Move some code from QtcProcess to its only user
This is not really nice/up-to-date either, but I'd rather
follow up on the user side.

Change-Id: I426fea3251b8984aea19788a16e574dccc3d057d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-01-27 17:49:46 +00:00
Christian Kandeler
e95c1d3c14 CPlusPlus: Fix tools build
Change-Id: I330990338b65b19436c908cea08a5280f40e6770
Reviewed-by: hjk <hjk@qt.io>
2023-01-27 16:22:41 +00:00
Miikka Heikkinen
9a72485ec8 QmlDesigner: Remove currently open component from creatable components
Fixes: QDS-8890
Change-Id: I51819beefb6983f58f472953f28a14e38f045130
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-01-27 15:05:56 +00:00
Eike Ziller
3724520499 Merge remote-tracking branch 'origin/master' into 10.0
Change-Id: I4dd2149e046d33b65e6d9c3497d0153f81fd3f31
2023-01-27 15:41:54 +01:00
Jarek Kobus
0f19fd6d0d TaskTree: Add tests for proper continuation unwinding
Change-Id: I79a077277328033b99fab6b2503621f3209c63be
Reviewed-by: hjk <hjk@qt.io>
2023-01-27 14:15:25 +00:00
Jarek Kobus
5bcb24cb71 TaskTree: Fix continuation when synchronous stop appeared
It may potentially crash when continuation unwinds on
synchronous stop. It's a similar fix to
567216bb49, this time it
fixes the continuation when not directly coming from
TaskTree::start().

The follow up commit adds a test for crashing case.

Change-Id: Idd936e42b567ff4bddab717267c62f0104bf3b62
Reviewed-by: hjk <hjk@qt.io>
2023-01-27 14:15:20 +00:00
Jarek Kobus
6b11e1d572 TaskTree: Revamp tests
Get rid of std::bind.

Enclose each data tag of processTree inside its own block,
so that "root" and "log" names are unique within each block.
This makes each block look like a pattern with filled data up.

Introduce TestData structure, so that it's harder now to mix
the order of test data in new rows.

Introduce some enums instead of bools to make more meaning
on the returned data.

Change-Id: Iffe49cf1c7f912378467ab9f9c1256003dba7b9c
Reviewed-by: hjk <hjk@qt.io>
2023-01-27 14:15:14 +00:00
Henning Gruendl
a7a4cbfe25 QmlDesigner: Fix TopLevelComboBox hover
Change-Id: I3531e010d9a13b11d2b93d1aa8f019307919268d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-27 13:52:36 +00:00
hjk
55dd933066 Haskell: Import from superrepo
Change-Id: I83c6c817c78ccbf1aee65847777f2652e19275a5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-27 13:30:26 +00:00
David Schulz
3a62e6d7f2 ClangTools: reduce priority of clangtool processes
Fixes: QTCREATORBUG-28719
Change-Id: I93e1db6e2494068a61fd0a877a0ef42aa0b11ae9
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-01-27 13:25:06 +00:00
Jarek Kobus
62e0b4052f Remove unneeded includes of utils/runextensions.h
BTW, spotted some other unused includes marked with yellow.

Change-Id: I364e4b6fae73a2be2cfd3a63c1100be4a91aa49a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-27 13:16:44 +00:00
Thomas Hartmann
c615f456df QmlDesigner: Fix FilterComboBox
The import for Controls shadowed the type of the local ComboBox.
Therefore ComboBox.ActivatedReason.Other
became undefined and this call was never executed:

onTriggered: control.compressedActivated(myTimer.activatedIndex,ComboBox.ActivatedReason.Other)

Task-number: QDS-8948
Change-Id: I8140f8e2905588687d9879a0828b28ba212c02d2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-01-27 12:45:31 +00:00
Christian Kandeler
97976fd3cb ProjectExplorer: Refactor BuildSystem::extraCompilerForSource
Factor out backend into more generic function to easily support new
accessors.
No functional changes.

Change-Id: I715ce2842d2c63574bdf6ada0d0e32fbfd5d08fb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-27 12:42:23 +00:00
Thomas Hartmann
94857925ab QmlDesigner: Slicence QTC_ASSERT
The selection can be empty.

Change-Id: I06856a58200893e841f99e95a02fa45acfc38332
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-27 12:40:14 +00:00
Jarek Kobus
49f3b8efd7 ITestConfiguration: Introduce testExecutable() helper
Reuse it in TestRunner.

Change-Id: I59ffd256a7e84f0d0726261496d73bc4f622d666
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-01-27 12:37:54 +00:00
hjk
040ef3b7d3 Docker: Use a optional<Environment> to handle the non-fetched state
Change-Id: I93ef9da6c9c7731b28f9d6fab6413ce9c4f428b4
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-01-27 12:37:51 +00:00
hjk
dab859e776 Utils: Replace Environment.isValid() with .hasChanges()
That's closer to the intended semantics. The "other" use in docker
will be changed to an optional<Environment> as follow-up to
keep this here mechanical.

Change-Id: I43ef9da6c9c7731b28f9d6fab6413ce9c4f428b4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-27 12:37:35 +00:00
Thomas Hartmann
39434062a2 Add option to hide tools
This allows hiding the tools menu by default.
Power users can enable it again.

Change-Id: I5465f0c525bb5b4954e13cb42a941ac8b6b7cf37
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-01-27 12:34:29 +00:00
hjk
930cbdf68b RemoteLinux: Merge abstractremotelinuxdeploy{step,service} file pairs
Plan is to merge the class hierarchies, this is a mechanical first step.

Change-Id: I163578297a4badb5b8c861283f0d6a44c25f124f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-01-27 12:30:20 +00:00
hjk
a938a82ca8 Boot2Qt: Use standard pattern for Qt version factory setup
Change-Id: I9fa8f0b38368e10ae73d068418f4bd95fc6e838a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-01-27 11:47:46 +00:00