Commit Graph

7228 Commits

Author SHA1 Message Date
Eike Ziller
ea5a050c5c Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
	src/plugins/mcusupport/mcusupportsdk.cpp
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
	src/plugins/qmldesigner/components/materialbrowser/bundleimporter.cpp
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp

Change-Id: I9317da0fc1243b9ce6d87f577aa843c51f132ad7
2022-10-18 10:48:46 +02:00
Miikka Heikkinen
6276f5514d QmlDesigner: Add QML/QtObjectPane.qml
In Qt 6.4 QtObject module resolves as QML, so add corresponding
property pane.

Fixes: QDS-7059
Change-Id: I115bd871132839dc170add254055022840176989
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-10-18 07:28:19 +00:00
Miikka Heikkinen
fdf1baecd6 QmlDesigner: Create asset_imports directory at project creation
Some watchers won't be initialized correctly if the folder doesn't
exist at project startup. E.g. texture images won't appear in project
view when material with textures is imported, unless asset_imports
already exists at project load.

Task-number: QDS-7813
Change-Id: I79449ae823d9005e74594f08bfa87abf44045caf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-18 07:28:06 +00:00
Ali Kianian
88c7562582 QmlDesigner: Fix the position of placeholder in FilterComboBox
The AutoCompleteString view had a bad position. The text property of the
TextMetrics was wrong, which caused the placeholder to have bad position
since the position was calculated with wrong text.

In addition, I prevented showing the placeholder when the root comboBox
is not opened, because otherwise it may show text when no item is
selected.

The main task was QDS-7662, which is now divided.

Task-number: QDS-7912
Change-Id: Ib937d923191ec3c544dae3259774cd2bb5b7adb0
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-10-18 06:24:11 +00:00
Ali Kianian
a0e87e458b Sections could be non-collapsible
A property named collapsible is considered for Sections. The default
value is true for this property.
The section would be affected by the user collapse request if the
collapsible is true (Single collapse by clicking, and colapseAll
request). Otherwise, the section will not be affected by user
requests.

Task-number: QDS-7527
Change-Id: Ic4c9d0489d4b8c9ec90a0c71c755fa4c52935d39
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-18 06:22:55 +00:00
Orgad Shaneh
ac28843c3a Themes: Use lighter link colors in dark themes
Fixes: QTCREATORBUG-28152
Change-Id: Id387d20373a3e19a36af9ec8f8c44798e1008ed1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-17 16:21:43 +00:00
Eike Ziller
66b99b5086 Fix translations of FolderNavigationWidget after moving to Core
It moved from ProjectExplorer::Internal to Core, and there is no reason
to throw the translations away.

German translation is fixed separately.

Amends dc5717bd06

Change-Id: I7a0a88c70e3454374de0b994fa1c20557c9a24e8
Reviewed-by: hjk <hjk@qt.io>
2022-10-17 13:59:48 +00:00
Eike Ziller
86beb2a950 Fix translations of file properties dialog
After inlining the UI file. Context changed and moved into the namespace
"Core::...".

German translation is updated separately.

Amends 568f83d964

Change-Id: I0540a533113f3f38ab527a6c6d8614c2699a6578
Reviewed-by: hjk <hjk@qt.io>
2022-10-17 13:56:23 +00:00
Mahmoud Badri
b983b8aa52 QmlDesigner: Implement unimporting bundle materials
Fixes: QDS-7904
Change-Id: I08642c25a2844547d0104a7b3d9fda6afe47cd38
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-17 08:05:50 +00:00
hjk
689ba1ead1 Debugger: Fix internal FilePath dumper
Amends 23e96dd6fe.

Change-Id: Ia602f09e4138125d41cb455b847e8b85ad767782
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-13 13:24:49 +00:00
Orgad Shaneh
7388003d16 Wizard: Add CMakeLists.txt.user to generated .gitignore
Fixes: QTCREATORBUG-25969
Change-Id: I72c8da5400e41194db6b239c2845fe110c2e3cf7
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-10-11 17:27:03 +00:00
Tasuku Suzuki
52672b5f6c SessionDialog: rename Switch To to Open and reorder buttons
To be consistent with the SessionNameInputDialog that has the button
"... and Open" to switch to a session.
Buttons should be ordered by like a typical file menu
- new
- open(ex- switch to)
- save(rename/clone)
- close(delete)

Change-Id: I875446352100500eaae4b0ecef4faa6442aef539
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-10-11 10:53:29 +00:00
hjk
19f2a95e1c Nim: Convert to Tr::tr
Change-Id: Iad4641479d566347ef9acdfb0a04f37907ac4a2d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-11 05:48:46 +00:00
hjk
c4957f9fdb BareMetal: Convert to Tr::tr
Change-Id: I7ac423c13d95b33cad332d2ce9fafb4f658980bc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-10-11 05:47:24 +00:00
Miikka Heikkinen
b8f4cd97d1 Fix copying dynamic properties on materials
Fixes: QDS-7803
Change-Id: I24c8cd269965552a62fbbbc521efbff00811fa43
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-10-10 13:53:03 +00:00
Mahmoud Badri
b0fa747565 QmlDesigner: Add "imported" icon to the icons font
Change-Id: I100a382a549b1945d7c7e83de0a3ffa609b5148c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-10 13:46:32 +00:00
Samuel Ghinet
7319eac283 Refactor Assets Library
Extracted the dialogs, the context menu, and the assets view into
separate qml files. Also, reordered some functions in the assets
library model

Task-number: QDS-7344
Change-Id: Ida21b60d30f34723c07b2659a138e14b95598421
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-10-10 12:00:23 +00:00
Alessandro Portale
c6244ac8df Meson: Fix .ts context names
Change-Id: If69784dcacfdb5974adc9b457e360c9b4b584102
Reviewed-by: hjk <hjk@qt.io>
2022-10-10 10:53:16 +00:00
Henning Gruendl
a7ceb64895 QmlDesigner: Add arrow to MenuItem for sub menus
Task-number: QDS-7867
Change-Id: Ia2c9dcf4534a5ccc2525f36720acb2d7f971abe4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-10 10:35:55 +00:00
hjk
9e2ec17f36 Meson: Convert to Tr::tr
Change-Id: I37e8a8c559464f7d55e17a5ca08e8d8d9760a4d6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-10 10:19:19 +00:00
Marc Mutz
8eb4d52342 Port from qAsConst() to std::as_const()
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally
starts to bother us (QTBUG-99313), so time to port away from it
now.

Since qAsConst has exactly the same semantics as std::as_const (down
to rvalue treatment, constexpr'ness and noexcept'ness), there's really
nothing more to it than a global search-and-replace.

Task-number: QTBUG-99313
Change-Id: I88edd91395849574436299b8badda21bb93bea39
Reviewed-by: hjk <hjk@qt.io>
2022-10-07 13:47:53 +00:00
Alessandro Portale
5c65115271 Android: Convert to using Tr::tr
Change-Id: Ie9110093101b0f49808b4da7b13ac3f47c3bb994
Reviewed-by: hjk <hjk@qt.io>
2022-10-07 10:24:32 +00:00
hjk
47e5997e57 Mercurial: Convert to Tr::tr
Change-Id: I2a6ecd17091ffa0100f982848afbf941c6997db7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-06 14:28:09 +00:00
Alessandro Portale
928a7d2087 Git: Convert to Tr::tr
Change-Id: I7fb1753109a9263c70c01713f5f4895db6b73662
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-10-06 12:32:58 +00:00
Eike Ziller
3811236903 macOS: Fix opening terminal
The scripts executable flag went missing

Amends a7956df3ca

Fixes: QTCREATORBUG-28251
Change-Id: I9773dee3967edc2ebb0eb49c539b37796a48cf5a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-10-06 11:44:24 +00:00
Alessandro Portale
f8f94a0ce1 QmlJSTools: Convert to using Tr::tr
Change-Id: I40595e560fb2499226bd2c914a0b78ed68f830ab
Reviewed-by: hjk <hjk@qt.io>
2022-10-06 08:54:09 +00:00
Tim Jenssen
964f539e55 Merge remote-tracking branch 'origin/8.0' into 9.0
resolved conflicts:
* doc/qtdesignstudio/src/developers/studio-designer-developer-workflow.qdoc
* src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
* src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
* src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp

and compile fix in materialbrowserview.cpp

Change-Id: I686e7e93ded8ac1afc792942ded47cd9fe4341ed
2022-10-04 13:44:42 +00:00
Mahmoud Badri
18fd37e331 QmlDesigner: Expand material browser sections when searching
Make sure material browser sections that have matches are expanded while
searching.

Fixes: QDS-7836
Change-Id: Ie30c5425e8efee65cc4bdfa473b269841e73a9d3
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-04 11:30:08 +00:00
Mahmoud Badri
9dda372b7a QmlDesigner: Fix material browser context menu open issue
Allow opening material browser context menu when search is empty.

Fixes: QDS-7837
Change-Id: I473b62d1f1b94a42d5c60f0e06a6d2b76b74ca6d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-10-04 10:19:57 +00:00
Alessandro Portale
78ef2e2b52 WebAssembly: Convert to using Tr::tr
Change-Id: I7fb420363884236ebd7eeb589a29a475f8911915
Reviewed-by: hjk <hjk@qt.io>
2022-10-04 09:31:38 +00:00
hjk
23e96dd6fe Utils: Use a single QString as data store for FilePath
Plus a few integers to get access to the pieces.

This reduces sizeof(FilePath) from 72 to 32.

Change-Id: I65eb856ad47b6a250c705d8d01893781a21d8e02
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-10-04 07:27:16 +00:00
hjk
63f3921334 CPaster: Convert to Tr::tr
Change-Id: I00242638e483aa9cb5b54473982eed137e859ff6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-30 10:13:08 +00:00
Christian Stenger
c42ae96ba8 Squish: Move wizard into plugin
Avoids a soft assert when parsing the wizards without having
the Squish plugin enabled.
As the Squish wizard is using customized wizard generators
that are only available if Squish is loaded we should limit
the presence of the wizard file to this case.

Change-Id: I091c1e429f28b07679245abdc9a638135af84761
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-30 09:31:34 +00:00
hjk
dda16c3abc Cvs: Move to Tr::tr
Change-Id: Iba6cfa75745ec2644c1a3dd20949971d16f6dba7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-30 08:18:24 +00:00
hjk
191815e974 BinEditor: Clean up translation contexts
Change-Id: Ibeb8c93ad1dfa816ccf1160abae8aac6781157d9
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-30 07:32:49 +00:00
hjk
479403e320 Bookmark: Clean up translations
Some unusual contexts went unnoticed so far.

Change-Id: I6017d8ae92310ee3b56538d1fa5c52f0de0a4c8a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-30 07:14:57 +00:00
hjk
685cc1a2fc AutoTools: Move to Tr::tr
Change-Id: I605c2b5c812b500c1db2bdbfab26882ee55249d2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-30 07:09:50 +00:00
hjk
ab4c9b9679 CMake: Move to Tr::tr
Change-Id: I169da93b5184351cb915d4c198fd33318fcfe06f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-30 06:56:21 +00:00
Henning Gruendl
502e94cbe9 QmlDesigner: Improve state group rename dialog
If the user presses enter when having focus on the TextField inside the
StateGroup rename dialog it will submit the change and close the dialog.
If the user presses escape it will reject the change and close the
dialog.

Task-number: QDS-7764
Change-Id: I8626c7b9ca9bf6d087c226343b3e6833641da54c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-29 14:45:50 +00:00
hjk
7ec2e724fe ClearCase: Move to Tr::tr
Change-Id: I0f65dfab1c73315d6877cfcc8a04cf202c0a3cdf
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-09-29 13:26:03 +00:00
Alessandro Portale
76238bed6c QmakeProjectManager: Convert to using Tr::tr
Change-Id: I08393b1f27bf238c8ac0ccb99e63e56a9d21ecb5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-29 12:08:43 +00:00
Eike Ziller
a254a9ba54 Merge remote-tracking branch 'origin/master' into work
Change-Id: I2235a55a599aaeca5d2b5377300a044b66c17da9
2022-09-29 12:03:13 +02:00
hjk
37db98db30 Debugger: Simplify TypeData setup and registration
Change-Id: Ib23249eae63901d614cbe33fe184f174a10efbe4
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-09-28 11:59:50 +00:00
Alessandro Portale
c06fab97f1 Wizards: Port "Code Snippet" Project Wizard to .json wizard
Code Snippet is the last .xml-based wizard shipped with Qt Creator.
This change ports it to the .json-based wizard format. Instead of
supporting just qmake-based projects (like it did), the new version
supports just CMake-based projects.

Change-Id: Ie64114165fff5d56ddf82041cc4d5f90c44fe77b
Reviewed-by: hjk <hjk@qt.io>
2022-09-27 14:29:05 +00:00
Thomas Hartmann
3b4b8aec4b QmlDesigner: Adjust caption for User Added Properties
Section does not have a tooltip, yet.

Task-number: QDS-7765
Change-Id: I5c0254cb81094be690fc5e9a076752f95f27a482
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
2022-09-27 10:23:02 +00:00
Henning Gruendl
79994c8504 QmlDesigner: Fix gap between extended states
Fix the gap between more than 4 extended states in a row.

Change-Id: I9c8435de0cba74267a23a970e0967388692f5811
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-09-27 09:03:43 +00:00
Miikka Heikkinen
07ab73fe7f QmlDesigner: Disable paste option for the original material
Fixes: QDS-7526
Change-Id: Ifdc220685a4881dc3a397d9148022b9be7b5032a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-09-27 08:51:21 +00:00
Eike Ziller
7eaa36e6e5 Merge remote-tracking branch 'origin/8.0' into 9.0
Conflicts:
	src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp
	src/plugins/qmldesigner/designercore/imagecache/meshimagecachecollector.cpp

Change-Id: I38f196e8f42cf11f7b613e7a723745600e35c5e9
2022-09-27 10:03:37 +02:00
hjk
f05a97fce5 Translations: Remove duplicates for "No changes to apply"
Amends 2d203763e8.

Change-Id: Ifb4e18c2f8c63b264a16aa59aa588e44972b2c19
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-09-26 14:38:58 +00:00
hjk
2d203763e8 Core: Inline externaltoolconfig.ui
Also collapse Core::ExternalToolConfig and Core::Internal::ExternalToolConfig
translation contexts.

Change-Id: I5764a85d8cdb33158a8ff770d5a769a752a051af
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-09-26 14:10:38 +00:00