Commit Graph

85691 Commits

Author SHA1 Message Date
Alessandro Portale
18817c4088 Designer: Remove extra contents margins in the settings dialog
Task-number: QTCREATORBUG-29108
Change-Id: If3c6b0bcf9e1f05705c7e85fd814740235dbc7a6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-03 15:19:02 +00:00
Jarek Kobus
f915a18a9e Process test: Adjust timeouts to minimize a chance for flakiness
The flakiness happened on mac inside recursiveBlockingProcess test.

Change-Id: I4d461fcdae1ecbf29f89bfdb4ad7ba017724f14b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-11-03 14:12:52 +00:00
Eike Ziller
f9d4697371 Merge remote-tracking branch 'origin/12.0'
Change-Id: Ice9c78147917fc13b6cf81ba781a37bdcd870e17
2023-11-03 14:58:00 +01:00
Leena Miettinen
0b322ef178 Doc: Describe the Preferred comment position option
...in Preferences > Text Editor > Behavior.

Updated screenshots.

Task-number: QTCREATORBUG-29392
Change-Id: If368d6e2e05c81b3b83007bad7636e275a0f3950
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-03 13:47:52 +00:00
Alessandro Portale
68222e6fd3 ExtensionSystem: Open PluginDialog without horizontal scroll bar
This makes the dialog slightly bigger to avoid that horizontal
scrollbar (when using normal font sizes).

Also, the header sizing code is a bit cleaned up. The "Loaded" column
takes less unnecessary space.

Change-Id: Ic7db7595a88a6dcedd52dce608aa1c9c79c8a464
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-11-03 12:55:08 +00:00
Christian Kandeler
a1b78d4234 ClangCodeModel: Fix shadow document handling
Our approach was not fully thought through: When we got informed of a
file getting created by an ExtraCompiler, we would make it known to the
first client that came along and then forget about it. This means that
e.g. a source file including a UI header would parse fine with the first
client that opened it, but after switching the build configuration or
possibly even just touching the project file, the UI header would not be
found anymore.
Fix this by keeping the information about generated files around and
attaching them to every newly initialized client.
Note that this state should probably be kept somewhere more central.

Change-Id: Ib1d8cca9258d1962513d8d463f5d16f9ff91a048
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-03 12:22:23 +00:00
Marcus Tillmanns
5f7be10349 Locator: Handle file create error
Coverity-Id: 1561120
Change-Id: Iefa1f6e7bc7a28d9f0d7427051896c49a413f027
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-03 12:20:31 +00:00
Eike Ziller
92ea715c0f German translation: TextEditor
Change-Id: I6f8150e16661cd2398bacd07dee73ac3720a5a64
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-03 12:17:42 +00:00
Eike Ziller
fbf3ba1081 German translation: Vcpkg
Change-Id: I3b8cffa00ecdc862ab974726df84e93a49701d04
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-03 12:17:30 +00:00
Brook Cronin
84b0501693 QmlDesigner: Add micro toolbar for connection editor code preview buttons
Task-number: QDS-10732
Change-Id: I67fef29db4b6dfb184a60e39723a6ab9437c694b
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-03 12:05:20 +00:00
Eike Ziller
e427a10788 German translation: Debugger
Change-Id: I92601c1893a4fd988daba36a97eaa1d7ae3b1f7b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-03 10:55:36 +00:00
Miikka Heikkinen
23f12f7b42 QmlDesigner: Add shader overrides for materials and models in 3D view
It is now possible to override all materials and models used in the
scene with options available in QtQuick3D.DebugSettings. The overrides
are assigned per-split.

Fixes: QDS-11068
Change-Id: I3a3bc372e860d7f61942eb40166464c9c86efd8e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2023-11-03 10:41:54 +00:00
Marcus Tillmanns
32f69227f1 IOS: Unify error handling
Instead of using some flags in some struct, we convert the error handling
to use expected_str<ResponseData> to clean up the error handling with
the outside.

Change-Id: I0f8d10c99715989e0069568ebc1d799d412a0600
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-03 10:01:45 +00:00
Eike Ziller
e562caaff2 German translation: Terminal
Change-Id: Ic5162171ae7d1d183438a306bf2bf6012a2e316f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-03 09:59:06 +00:00
Eike Ziller
53c695663a German translation: QmlJsEditor, QmlPreview
Change-Id: I7fe99241919c4e519fd818b4f021780939a8722f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-03 09:57:57 +00:00
Eike Ziller
f4a0178463 German translation: Git, Help, ImageViewer
Change-Id: I1911f39f6cc0f5c81ff15dfbb2f208d0d80f6a8d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-03 09:57:36 +00:00
Eike Ziller
2f6d87a689 German translation: CMakeProjectManager, CtfVisualizer, FakeVim
Change-Id: I0c47f085f1ed1cba4127fb064159d0e7e430ac52
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-03 09:57:21 +00:00
Eike Ziller
4c93936e23 German translation: Utils
Change-Id: I41b761f2c51bcbd858f0ba25edfd78bcdc162c5d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-03 09:57:08 +00:00
Marcus Tillmanns
d2b7f9d27c IOS: Fix infinite timeout
Previously the "runCommand" function would never exit if the child process
hangs. This fix makes it so that the caller can specify a function
that determines whether we want to continue to wait.
In this function we then check if the promise has been cancelled.

We also let runCommand return an expected_str to better reflect actual
error reason.

We also early-error in various places to keep indentation low, and
make it easier to track where something returns an error.

Task-number: QTCREATORBUG-29564
Change-Id: I71ee4568d87c6b21c3ba9c71b81d028d517b553a
Reviewed-by: Serg Kryvonos <serg.kryvonos@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-03 09:56:06 +00:00
Aleksei German
6a4850b1d8 QmlDesigner: Disable Style combobox for MCUs
Task-number: QDS-10338
Change-Id: I6e8242db0bd3f0981bb4d6d699f8780ae1cb6925
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-03 09:06:07 +00:00
Aleksei German
47c7f22107 QmlDesigner: Fix hardcoded qtquick style config
Task-number: QDS-11097
Change-Id: I0ebd531ee04420eae4d42de4c03205b592ff59af
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-03 09:06:02 +00:00
Aleksei German
52e652c986 QmlDesigner: Extend ToolBar backend for MCUs
Task-number: QDS-10338
Change-Id: I552cb25b9690a0c5dd202d99e8220453225bcd3b
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-11-03 09:05:57 +00:00
Eike Ziller
892cfccd46 German translation: ProjectExplorer
Change-Id: Ied1910d55233710f9022058d75276c51a6587e88
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-03 08:56:38 +00:00
Brook Cronin
0899c540be QmlDesigner: Make kit settings button a toggle
Task-number: QDS-10258
Change-Id: If680778b6cc1f5795887ac9da69f35ae9858308c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2023-11-03 08:51:34 +00:00
Thomas Hartmann
4d1a210060 QmlDesigner: Use isInteger, isFloat in isNumber
Change-Id: I20b81b54c0f7758e9e864ff50174ac2d7527fb38
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
2023-11-03 08:39:15 +00:00
Eike Ziller
218e8b57d9 German translation: Copilot
Change-Id: I24915af68ab3285d2946c805c1ac1d09c5abba3a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-03 08:38:31 +00:00
Christian Kandeler
e6799e4e7f QbsProjectManager: Fix importing Qt projects on macOS
On macOS, qbs always sets the sysroot to the xcode directory, while Qt
Creator's kits do not have a sysroot entry for Desktop targets.

Fixes: QTCREATORBUG-29829
Change-Id: I3f11c45fdcd94e67be1b6ef6c50cd33834c74f40
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-11-03 08:32:59 +00:00
Eike Ziller
45d99c2cee Fix running tests if system language is not english
Force built-in tr strings when running tests. Some tests rely on these,
e.g. the JSON wizard tests in ProjectExplorer.

Change-Id: I27836adce0bd2f8c6919a8b1948e41f719c08b3e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-03 08:11:38 +00:00
Eike Ziller
e7644805e2 German translation: Android
Change-Id: Icd4f056137c55e2eff3e9c3e7d21c081e6509414
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-03 08:11:24 +00:00
Eike Ziller
3a5124521d German translation: Autotest
Change-Id: I4aad971811a6b880104590094eb602816ac286a9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-03 08:11:18 +00:00
Eike Ziller
a6600521e0 German translation: ClangCodeModel, ClangFormat, ClangTools
Change-Id: Iccfdef75a83b902b4e4769ecf2a0127ec66d3b7d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-03 08:11:12 +00:00
Mitch Curtis
086fafbd49 Move Main.qml onto its own line in Qt Quick project templates
- Matches other commands in other templates (e.g. PROJECT_SOURCES).
- Makes it that little bit easier for users to add more files.
- Encourages users not to cram everything onto one line.

I didn't change qtquickapplication_compat/CMakeLists.6.x.txt
because I assume %{AdditionalQmlFiles} expands to many entries
per line anyway (and if so, that should be changed too).

Change-Id: I0cd33181e7000f070aa563e2341f739df8956e6d
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-03 08:10:07 +00:00
David Schulz
024f653806 Python: initialize run configuration with kit python
Change-Id: I85ebe906bee2d9bc88c443f0189a685ac97ee30d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-03 08:09:17 +00:00
Leena Miettinen
65366d96c3 Doc: Describe the "Prefer .clang-tidy file, if present" option
...in Preferences > Analyzer > Clang Tools.

Task-number: QTCREATORBUG-29392
Change-Id: Ied7b2894cbe3c502db7d787532ecd1bf6822cea0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-11-03 07:44:48 +00:00
David Schulz
f5e12237a2 Python: avoid detecting pythonw on windows
Change-Id: I75fcba53fa671904405d3411409c6ea67335e81b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-03 07:37:54 +00:00
Eike Ziller
51673043cd German translation: Update .ts file
Check out with submodules (`git submodule update --init --recursive`).

Configure Qt Creator:

    cmake "-DCMAKE_PREFIX_PATH=<qt_path>;<llvm_path>" -
DCMAKE_BUILD_TYPE=Debug -G Ninja <src>

Generate ts file:

    cmake --build . --target ts_de_cleaned

Change-Id: I2145d6af782e747950d99b27e5ad7e26a0d6dafd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-03 07:29:09 +00:00
Christian Stenger
cf88267011 Debugger: Adjust libcpp based optional dumper
There is no added value in providing the value of the
internal 'engaged' - just provide the value if possible.

Change-Id: I8c308902bf82c43e4238568fc9b185c3a3994b47
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-11-03 06:14:07 +00:00
Mike Chen
10a390c3d2 StyleHelper: fix floating-point DPR icon pixelated
set the DPR as a floating point number for the pixmap.

Change-Id: I354e27556dbd8a0d53cfc3e0c2b708f06406aaf5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-11-03 02:55:14 +00:00
Marcus Tillmanns
89da353746 Debugger: Don't copy unnecessarily
Coverity-Id: 1525663
Change-Id: Ic6abd81fbf3255700aac8e08592a5a59f08ea4ab
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-11-02 14:42:59 +00:00
Marcus Tillmanns
4593089bdc Debugger: Check return value
Coverity complains about not checking the return value of f.open()

Coverity-Id: 1359453
Change-Id: I9e6b7f5d3ab6ec58e99131e8a0d84d8f17863fed
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-02 14:42:52 +00:00
Thomas Hartmann
f466ac7ce2 QmlDesigner: Add real as number type
Task-number: QDS-11098
Change-Id: I2825215f0ce9c57f2f88318bcdf1ecc11defa793
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
2023-11-02 14:12:40 +00:00
Marcus Tillmanns
5becefbe72 Debugger: Fix QImage dumper
Change-Id: I423d139a16a8a08d9135a1d489c4d38ebac9c0f6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-11-02 13:58:01 +00:00
Thomas Hartmann
4d55d6be18 QmlProject: Fix crash
If no replacment kit is created we have to return.

Task-number: QTCREATORBUG-29717
Change-Id: I7c91eeb5a3710640adfa0a561aaac4fefc8f1431
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-11-02 12:46:44 +00:00
Pranta Dastider
b44008f15a QmlDesigner: Update the Animated State Transitions doc
This patch updates the Animated State Transitions document.
Removes an old image and adds a new image to support
the current connection view update. Also, changes some texts
to keep the process relevant.

Fixes: QDS-11055
Change-Id: I4ea3face56df6cec05adfd8244d32dc20d7e6e16
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2023-11-02 12:39:26 +00:00
Thomas Hartmann
fc1c720aec QmlDesigner: Move the functions to handle assets drops
Moving those functions to ModelNodeOperations allows reuse in
other views like e.g. the TextEditor.

Change-Id: I7eee1c6080b4208ffaab6637f0debf78ec648c8e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-02 12:34:09 +00:00
Amr Essam
94e55865f7 QmlDesigner: Fix cmake issues for effect maker
Also some cleanups to cmake removing ShaderTools

Change-Id: I9ae35a808943f2e4ad7f2b395854b1a245221246
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-11-02 10:56:45 +00:00
Mahmoud Badri
eabebac670 EffectMaker: Enable the enable node feature
Also corrected an include

Change-Id: I2c1c2385f30edbd6e5f53e81fc4794a0cc3e56d9
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-02 10:51:43 +00:00
Amr Essam
3789277328 QmlDesigner: Sync compilation with add/remove composition nodes
Now when there are no effects, default state is restored
Also some cleanups

Task-number: QDS-11064
Change-Id: Iad25adf2c0f855cb709c494d9f3eb47ef6207d36
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-11-02 10:42:54 +00:00
Mahmoud Badri
6a5e7920ce EffectMaker: Enable using project assets as effect textures
Also fixed few warnings by adding dummy needed context properties.

Change-Id: Ieed0f9d409302ba9ff1409b9081cda942e46d2e9
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-11-02 10:25:17 +00:00
Johanna Vanhatapio
b46d9de784 Doc: Remove outdated videos
Task-number: QDS-10565
Change-Id: I91d8bf4f6fb8f0b5b756fa4a3bf94753ab16adfb
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
2023-11-02 10:17:30 +00:00