Commit Graph

72811 Commits

Author SHA1 Message Date
Jarek Kobus
bbed189656 QmlPreview: Get rid of permanent thread
Use TaskTree with AsyncTask instead, on demand.

Change-Id: I227858eceef822c4106165c561f8ede56dfb78ca
Reviewed-by: hjk <hjk@qt.io>
2024-07-26 07:33:52 +00:00
Jarek Kobus
912dee875a UpdateInfoPlugin: Simplify recipe
Use conditional expression with nullItem.

Change-Id: I834741e20c977a3e64967753b4b5753a6d280567
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-07-26 07:27:03 +00:00
Eike Ziller
5ba1ef9dbb Meson/ToolWrapper: Fix missing initialization of m_isValid
Amends a4a92a04a1

Change-Id: Idab3141317729a6c2cf2ce0eaa1aa8c09ef1a1d7
Coverity-Id: 1598577
Reviewed-by: hjk <hjk@qt.io>
2024-07-26 06:59:52 +00:00
Lukasz Papierkowski
f37d07cbf4 Lua: Add Timer to the Utils bindings
Change-Id: I7702bae1770f668ffb2f937a357a0156b7db84b4
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-07-26 06:41:12 +00:00
Jarek Kobus
8d429afecf Meson: Use new setup schema for MesonProject
Change-Id: If5d60fe9e6d1afe16585c345ddc026af69560d1d
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 15:50:36 +00:00
Jarek Kobus
d0621a7d54 Meson: Dismantle classes in favor of static methods
Change-Id: Ifefd2847feb57c613a4089ed9d12b0d07d91d30c
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 15:30:34 +00:00
Jarek Kobus
3188c8785b Meson: Hide BuildOptionsParser and most of MesonInfoParser
Change-Id: I5006bbb0db5c8a26783cbf1a8942b48c7b939d59
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 14:32:42 +00:00
Andre Hartmann
b4946da9ea VCS: Improve submit message check
Do not show the "commit message is short" text while
the user is still typing the first words.

Therefore, make the initial timeout larger and restart
the timer whenever the submit message changes.

After the minimal subject length or a newline is entered,
switch to faster evaluation.

Change-Id: I41034ed2c8e71e81dae42685bc9ff310edca2543
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2024-07-25 14:01:27 +00:00
Jarek Kobus
f0a24c8093 Meson: Remove unused MesonFileNode
Change-Id: If4abb94c6b69871aa137cdca7f7a80fe50cc9d19
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 13:43:24 +00:00
hjk
bb7feab97b Meson: Inline one of the findTool() into its only user
Change-Id: I6cadbc4a7c70fe8fc7590c12a638dd472df3f327
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-07-25 13:38:15 +00:00
hjk
96b508c84a Meson: Merge two ToolWrapper constructors
Change-Id: I4a9fcc211e2718ff26f4e03c71ed89095db099ec
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-07-25 13:10:10 +00:00
hjk
c4fbd6a3f7 Meson: Dissolve WITH_UNCONFIGURED_PROJECT macro
Only used once.

Change-Id: I74213ca13c694a53316c69ebc241608a876e2e8f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-07-25 13:10:02 +00:00
hjk
3fe426e053 Meson: Remove some explicit use of QFileInfo
Change-Id: I5fa65b29516f80afdc2b00934ed39e63ae5a3a24
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-07-25 13:09:50 +00:00
Marcus Tillmanns
8e037b6019 Fix deprecation warning
Change-Id: I18d3f9b576d6c840587339fb6e3c62283a2f761f
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 12:50:42 +00:00
Eike Ziller
3f47819893 Translations: Add an english file for short-term spelling fixes
If there is just a spelling error in the source text that can be fixed
without changing the text's semantics, we can do that after string
freeze without interfering with the work of translators that might
already have run lupdate and started translating, by adding an english
translation file.

This should never be used to fix the meaning of the string in any way,
and should be dissolved into the tr() calls (+ fixing source tags in
translations) before the next string freeze.

Change-Id: If72505b0ca22c35ef41c0cfabed669a800315f20
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 12:49:16 +00:00
Marcus Tillmanns
b9ac8bb3ba Fix warnings
Change-Id: I7b98e8b27c1f17f93e71eec8baa12b8b985529eb
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 12:46:56 +00:00
Jarek Kobus
943efa0535 Meson: Inline ArrayOptionLineEdit
Change-Id: I28da4e5edd6a74274c17ad6b5fe91d161c574388
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 11:45:19 +00:00
Alessandro Portale
4f31d77e6e Core: Remove deprecation warning
Use the QFontMetricsF constructor instead.
(Which I hope this change does as requested by the warning)

Change-Id: I89992715f5cc0a2e1b5e98498c2cc36bb705b187
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 11:41:16 +00:00
Cristian Adam
a8cbd17733 CMakePM: Implement "FOLDER" property for targets
See the CMake documentation https://cmake.org/cmake/help/latest/
prop_tgt/FOLDER.html

This allows placement of targets in the project view in specific folders
like e.g. "tests"

Qt Creator (ab)uses the FOLDER property for the "qtc_runnable" feature,
see https://doc.qt.io/qtcreator/creator-run-settings.html
which would not allow to have both.

The "qtc_runnable" should be fixed by having a property "QTC_RUNNABLE"
for a target and have Qt Creator parse the code.

Fixes: QTCREATORBUG-28873
Change-Id: I73433de78b9a86f631ee9d7903db535b69b734f6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-25 11:37:14 +00:00
Jarek Kobus
b4b2dd12fe Meson: Inline projecttree filepair
Change-Id: I62ba5ef90083f9bc342b4900bbc9ba57390d5e3f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 11:30:37 +00:00
The Qt Project
ad69cbc6bb Merge "Merge remote-tracking branch 'origin/14.0'" 2024-07-25 10:57:26 +00:00
Eike Ziller
3bbfd66bad Merge remote-tracking branch 'origin/14.0'
Conflicts:
	src/plugins/android/androidmanager.cpp
	src/plugins/android/androidrunner.cpp
	src/plugins/android/androidrunner.h
	src/plugins/qmldesigner/components/texteditor/texteditorview.cpp
	src/plugins/qmldesigner/components/texteditor/texteditorview.h
	src/plugins/qmldesigner/designmodecontext.cpp
	src/plugins/qmldesigner/designmodecontext.h
	src/plugins/qmljseditor/qmljseditingsettingspage.cpp

Change-Id: Idada49bb7441e8c5b748bd75b2e6bb2351bd323e
2024-07-25 12:56:53 +02:00
Jarek Kobus
847012000f Meson: Squash remaining namespaces
Change-Id: I44b8ba867f01dfd917a0d1c53c9487865b781d2a
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 10:51:42 +00:00
Jarek Kobus
24dab04a33 Meson: Reuse ProcessRunData instead of self-made Command struct
Change-Id: Ie4a989976e3684b0931d5cdb49fbc06b76ebcb67
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 10:51:30 +00:00
Jarek Kobus
0984b7b0c8 Meson: Hide versionNumber() in cpp and make it static
Change-Id: I0132de7b6a7df7dd5d6ae4f1ddef52d5af33729a
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 10:51:23 +00:00
Jarek Kobus
d10c720dfc Meson: Get rid of unused mesonInfo field
Change-Id: I29c482a81e7628bc877761dca8fc83b326120b06
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 10:51:16 +00:00
Jarek Kobus
61b139dbfe Meson: Inline InfoParser inside mesoninfoparser.h
Change-Id: I29a811ce963f94f90d3cbb07adf72ff3729c3f5e
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 10:46:11 +00:00
Ali Kianian
64a9f8a15a QmlDesigner: Edit the style of Materrial Menu of 3D View
Fixes: QDS-13265
Change-Id: I98c3091a859783b3f1c450fd20e70351ce48303c
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-07-25 10:41:57 +00:00
hjk
ed2530a0f9 Utils: Remove unused Id::versionedId()
Change-Id: I17dbab790a90fbe7c6a2625a58cf12c7c920f96d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2024-07-25 10:23:33 +00:00
Jarek Kobus
41bdcabe5f Meson: Get rid of MesonInfo, use QVersionNumber directly
Change-Id: I482cfdfe988c10e592b0f2bf106b6ace41cf44ad
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 10:23:28 +00:00
Jarek Kobus
f9bb9feda4 Meson: Use QVersionNumber instead of self-made substitute
Change-Id: I6d4168a0be3e14f39baf469f47bc292779fe286a
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 10:23:20 +00:00
Jarek Kobus
319e87fd6c Meson: Remove empty header
Change-Id: I89f4e3066ef232d53280f8ecbc7a677722a366ea
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 09:51:53 +00:00
Marcus Tillmanns
e78c132249 Utils: Add FilePath::operator/=
Change-Id: Icd1ec095ec241707832cbe5d8438017b3e0ef0de
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 09:14:42 +00:00
Marcus Tillmanns
768c6d5a0e Utils: Fix deprecation warnings
Change-Id: Ia38272aa132f366e297ce376255356abb67c6ce9
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 09:14:35 +00:00
Marcus Tillmanns
b8fb2b11b4 ExtensionBrowser: Fix OsType
The database calls it "macOS", not "Mac".

Change-Id: I624c223b1d6b291a9d6797f3775d81f05684ee86
Reviewed-by: hjk <hjk@qt.io>
2024-07-25 09:14:29 +00:00
Marcus Tillmanns
e5d92aba2a Lua: Document translate module
Change-Id: If4c78329a386d2cd3cfa05ce883a320e84163e23
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-25 09:11:56 +00:00
Ali Kianian
7c17349296 QmlDesigner: Repolish materials action in 3d context menu
1. Instead of a single action, a menu is shown. This menu contains all
of the materials of the selected node.
2. If multiple nodes are selected, the intersection of the materials is
shown.
3. Having several identical materials in a nodes are supported.
4. For each material, there are two options
* Remove (Removes the material from the selected nodes)
* Edit (Opens the material editor for the selected material)

Task-number: QDS-12375
Change-Id: Icc19a4127dc490490e4464ce840e89e5379c5e8c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2024-07-25 09:05:33 +00:00
hjk
665ec382bf App: Use namespace Utils
Change-Id: I9e089f692af9579c2def54e06d953ed3ed4e5b16
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-25 09:03:30 +00:00
hjk
c811b93ece App: Move the -style check into windows-specific code
Creates warning about unused variable on Linux.

Amends 3babe8c73.

Change-Id: I038502afc7e488354da7c871520c39a08ec54aa6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-25 09:03:15 +00:00
Lukasz Papierkowski
98c55d979b LUA: Add hasSelection() to the TextCursor binding
Change-Id: Icd6467d454eeadd80f4c836902428ea961ce60fe
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-07-25 06:46:57 +00:00
Lukasz Papierkowski
8b4cb5f9f5 LUA: Add setSuggestions() in TextEditor bindings
Change-Id: I29067ab0beb8eeddc4348bb0ddf2ab37a4af8a09
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <mua@spyro-soft.com>
2024-07-25 06:43:28 +00:00
Jarek Kobus
b733a16cce Android: Avoid code repetition
Add extra args to removeForwardPort().

Change-Id: I3aed7974aff327f29db9f62e4714ba2696b81dd6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-24 17:54:48 +00:00
Jarek Kobus
6c15cc6bf9 Android: Simplify removeForwardPort()
There is no need to split the output into separate lines
and search for port number in each line afterwards.
Search for port number in the whole output instead.

Change-Id: Id020bd5a73080be30b6cef47853e027235105ae3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2024-07-24 17:54:39 +00:00
Marco Bubke
3e05959468 QmlDesigner: Use more string views in the model
To decouple the string implementation from the internal string. It
should lead to much less allocations too after the rest of the code is
converted too.

Change-Id: Ifb49f57b9e5ac5af4963e1257c535ddef6044d93
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-07-24 14:10:51 +00:00
Marco Bubke
fc0cedf347 Utils: rename SmallString::countOccurrence to count
Change-Id: I3ff28aa0ac36191e3352dd0c8ef0942bfa6b9b25
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2024-07-24 14:10:44 +00:00
hjk
e57b635a6e Core: Hide MimeTypeSettings(Page) implementation
Change-Id: I0307e7e4f6172142c344c977b297ffc705a351ea
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-07-24 13:59:47 +00:00
hjk
8bf578669e Utils: Add LayoutBuilder::Splitter::setChildrenCollapsible()
Change-Id: Id404f061c68401a4d33916637214f01eb423c3e9
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2024-07-24 13:54:09 +00:00
Eike Ziller
8758c3c8dd Editors: Fix crash after triggering dropdown menu after closing editor
The context menu kept a handle on the editor and document, and these
could be deleted behind its back. Use QPointers to actually check.

Fixes: QTCREATORBUG-31232
Change-Id: I613abbe6dc0fbac60c2e527f715a7b8c2f083893
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2024-07-24 12:56:07 +00:00
Jarek Kobus
e7b97ee375 CorePlugin: Fix warning about deprecated operator int()
Operate now on QKeyCombination instead.
Return false if there are modifiers other than Shift or Keypad.
Otherwise, return the result of comparing key() with the Escape key.

Change-Id: Ica6409a7b7b5ed28e79915691c40a898008735f7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-07-24 12:41:00 +00:00
Alessandro Portale
8ea9028491 ExtensionSystem: Use description text in PluginDetailsView as MarkDown
Task-number: QTCREATORBUG-31199
Change-Id: I6f7d0c711a083636e8d37beb47a1ec14d139a557
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2024-07-24 12:40:07 +00:00