Commit Graph

68765 Commits

Author SHA1 Message Date
hjk
5d21da74f9 Utils: More explicit host os use to make it stand out
Quite a few of the uses are actually wrong, but are better visible
now and therefore more likely to be fixed.

Change-Id: Ia51f7d6eb1b2d3a9c9f73d67dabacfd227c44b15
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-03-07 15:53:18 +00:00
Miikka Heikkinen
269738d7e5 QmlDesigner: Force QDS compatibility mode 3D import option
QDS requires 3D imports to use QDS compatibility mode to work correctly,
so we force designStudioWorkarounds option on in all imports we do and
hide the option from UI so user can't toggle it off.
Since designStudioWorkarounds supercedes expandValueComponents option,
we also hide that as setting it has no effect.

Fixes: QDS-9219
Change-Id: Id40a45338ea630228f59b111703eba661ebd357b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-03-07 14:29:12 +00:00
Eike Ziller
d686d241d2 Build: Avoid installation of huge static QmlDesignerCore library
It is not used as a public interface, just to share with tests. Do not
install it.

Fixes: QTCREATORBUG-28673
Change-Id: I669ffd468291b8150568d0193a33e5795d58f017
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-03-07 14:23:02 +00:00
Cristian Adam
d0fae7fa59 Terminal: Fix conpty process creation
When the Project's source directory would be used as a working directory
for the terminal, conpty would fail to start the shell.

Change-Id: I1050ec11c2bb46e17187431114a1319c86dd449c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-03-07 13:56:59 +00:00
Jarek Kobus
69fa8f3f3c FilePath: Integrate FileStreamerManager for async i-face
Change-Id: I3371471e3c23b86a62b5e4056b343941ab46e191
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
2023-03-07 12:22:40 +00:00
David Schulz
ae2690e4b1 Debugger: make default number of array elements configurable
Change-Id: Iad7b653d66f9f87d818f8cce612a82a5fc391b23
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2023-03-07 11:14:54 +00:00
Sivert Krøvel
7375e367b2 McuSupport: Remove status message
The status message notifying that the input.json used to generate
the project tree in an MCU qmlproject is not interesting to most
users, and it is shown several times if using modules. Removing
it gets rid of some clutter in the General Messages output.

QTCREATORBUG-28824

Change-Id: I8b97aeff7b872e52e260f035f7f48144a8caf167
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-03-07 10:25:21 +00:00
Mahmoud Badri
a77ae66ace QmlDesigner: Implement dragging an image to a material
Fixes: QDS-9269
Change-Id: Ia71d87773e6acce6659a30985d77d848feea0a89
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-03-07 10:16:35 +00:00
Thomas Hartmann
91e7efa5e0 QmlDesigner: Use StudioQuickWidget in item library
The event filter has to be installed on the actual QQuickWidget.
Using registerPropertyMap instead of global context properties.

Task-number: QDS-9124
Change-Id: I03c71dce228a7b8713bd1a5085541ed06c7ee0bd
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-07 10:09:14 +00:00
Miikka Heikkinen
c78c4817cd QmlDesigner: Fix asset drag to material browser
Drag now correctly accepts only assets that can be used as textures.

"selected_texture_changed" custom notification was used in two
semantically slightly different cases, both to indicate selected
texture had changed and that selection should change, which was little
confusing. Split the two cases to separate custom notifications to
clarify the situation and allow "select_texture" to be handled in
material browser even if it sent it. This fixes the issue of newly
added texture not getting selected after drag, because creation was
done by material browser view.

Similar issue was fixed with "selected_material_changed" as well.

Also fixed a couple of cases of drag not being properly ended.

Change-Id: Ie1cae01ef13b687d9e611ac1c91443688001fe49
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2023-03-07 09:30:08 +00:00
Christian Stenger
0f1f5435ea Terminal: Fix build before Qt6.4
Change-Id: Idc1138289516eb2cdeffc310cec4b9ba019d1b16
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-03-07 05:54:58 +00:00
Marcus Tillmanns
66094398fb Terminal: New Terminal opens project folder
Change-Id: I974a3c73363a810a18f9327d8682c2a56a42fee2
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-03-06 22:55:59 +00:00
Marcus Tillmanns
f95f815e98 Terminal: Add support for Cursor shape and blink
Change-Id: I7f71578a714d375bcd4ef8ae431f4127cbc57a55
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-03-06 22:55:50 +00:00
Christian Kandeler
2ac2c5c07d Copilot: Fix warning
Change-Id: If2c9c8bf6c2af6eb712949ef200935b4d24cc69b
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-03-06 21:04:00 +00:00
Jarek Kobus
8660ee06db SdkPersistentSettings: Fix build - part 2
Amends c26db7a657

Change-Id: Idf934d4095f29ef413f59b211a292b48957d44b2
Reviewed-by: hjk <hjk@qt.io>
2023-03-06 17:45:49 +00:00
Christian Kandeler
dc1a3f8a8d Fix qbs build
Change-Id: I840fbce750ce354ec99dd2019dea924326319271
Reviewed-by: hjk <hjk@qt.io>
2023-03-06 16:54:15 +00:00
Jarek Kobus
c26db7a657 SdkPersistentSettings: Fix build
Amends bb4d9c92e7

Change-Id: If20b80f30d87b1be8f606cab402c5a220fa68d07
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-03-06 16:23:46 +00:00
hjk
e38b817fc0 ProjectExplorer: Split Session and ProjectManager files
Still a lot of cross-referencing in the implementations, currently
faciliated by a separate session_p.h that is meant to go away again.

Change-Id: I6e32a62e02f60e790e54637de5de945bfaca36f6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-03-06 15:41:36 +00:00
Marcus Tillmanns
098c76832a Terminal: Rewrite rendering
The rendering has been rewritten to use cached GlyphRuns instead
of text layouts. The VTerm specific code was moved into
TerminalSurface.

Change-Id: I10caa3db4ee932414987c9ddae2dcb777dc1f6e7
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-03-06 15:41:29 +00:00
David Schulz
eccdea6a43 Revert "Debugger: Fix write error on terminated GDB process"
This reverts commit 87c00b86db.

Reason for revert: Breaks shutting down the cdbengine and according to the diagram in debuggerplugin.cpp this is an expected transition.

Change-Id: I051ccd315dffcadf60892c33cd7c1f3523b2f8e0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2023-03-06 15:35:50 +00:00
Christian Kandeler
c9ad7d6cee Update qbs submodule to HEAD of 2.0 branch
Change-Id: Ibc1100fd624e4ad51e5ae297cddd8e20f572b687
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-03-06 14:17:43 +00:00
hjk
bb4d9c92e7 SdkTool: Fork utils/persistentsettings
And a few helper classes. This allows SdkTool being build
without Creator's Utils, and does not impose restrictions
on the development there.

Change-Id: Id15db9293f343ad2aeee5c09cc819d112ec144e4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-03-06 13:37:52 +00:00
Christian Kandeler
755d9769d8 CPlusPlus: Add support for coroutines
Also fix some concept-related bugs uncovered by the test case.

Change-Id: Ia67c971026bcd85d9cc252f46cd4f56c2865d432
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-03-06 13:20:04 +00:00
Miikka Heikkinen
9a55bb0fd0 QmlDesigner: Take content library texture metadata file in use
Metadata file texture_bundle.json will be included with bundle icons,
and it contains details about the texture (format, dimensions, and size)
that are useful to know before downloading the texture.

Metadata is used to generate proper tooltip for non-downloaded textures
in content library.

Also removed default suffix from displayed filename in case metadata is
missing, as it was misleading.

Fixes: QDS-9230
Change-Id: Icbe0bbb7f1e663e0adc41d379231b7f41dc79e31
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-03-06 12:22:54 +00:00
Christian Stenger
2ca1a15ead AutoTest: Fix ordering of Qt results
Fixes placing of internal messages like Qt version
information or Qt Test version

Change-Id: I08330451684c2dccb5f260cf7a4751bba47e56a8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-03-06 10:25:05 +00:00
Tim Jenssen
eb16c66552 QmlDesigner: adjust content library paths in .app bundles
Change-Id: I7109b25097d061dbbbc8828273b5d0acfe94bf3c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-06 10:07:41 +00:00
Jarek Kobus
ce457a9cdc ILocatorFilter: Replace refresh() with refreshRecipe()
Most of refresh overrides were running synchronous method in main
thread, however, it was really convoluted: we were starting
asynchronous call and from inside the method running in separate
thread we were scheduling the call back to main thread.
Use Tasking::Sync for these cases instead.

The only subclass that is doing the real asynchronous refresh
is DirectoryFilter. Simplify the async call internals and
pass data to the async call explicitly. Move the refresh method
outside of DirectoryFilter class (to make it clear we shouldn't
touch private members).

Change-Id: I6af788611bdc49db1ff812f91202ac40a280fbc8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-03-06 09:55:07 +00:00
Christian Kandeler
913513ff62 qbs build: Turn off warnings for vterm library
As in the cmake build.

Change-Id: I2cbc5d3fcae89053f310675dc0ea55c52f72f646
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-03-06 09:21:34 +00:00
Orgad Shaneh
70369aca13 Android: Remove unreachable return
Reported by Coverity.

Change-Id: Id1b67f0adae3ff0c9157428726778c8c3b2a03a7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-03-06 08:32:01 +00:00
The Qt Project
a50ca812f4 Merge "Merge remote-tracking branch 'origin/10.0'" 2023-03-06 07:50:20 +00:00
Orgad Shaneh
cabba52a89 Utils: Fix bad condition on iterator end
Detected by Coverity.

Amends c1b1842c48.

Change-Id: Ie0233aab33317e286722dec7066d11dfc2a11a06
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2023-03-06 07:32:04 +00:00
Eike Ziller
36d9341397 Merge remote-tracking branch 'origin/10.0'
Change-Id: Idf151b6cfe87957cf905e67aab6b1275b9f0506a
2023-03-06 08:24:18 +01:00
hjk
ae86a6a4bc Utils: Remove some iterator bases accessed to Environment
Now unused.

Change-Id: I21bce9218662d9cb8acc18e5c2ede6dfbb8962bb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-03-06 06:45:20 +00:00
Christian Kandeler
2fd91ad18e Fix qbs build
Change-Id: Ic2673f6f90610b1e58c9ec1fbf2f63522068cca8
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-03-06 05:32:18 +00:00
Tim Jenssen
ef6ab90d1c crashpad: add sha to sentry annotations
Change-Id: I7142da6d8fc61643512ff2ae6f581bf6795ab802
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-06 04:46:49 +00:00
Tim Jenssen
b619f24396 crashpad: change chrashpad dumps location to user directory on macOS
This is necessary to not pollute the signed and notarized .app
bundle.

Task-number: QDS-9113
Change-Id: I74e0bced5679faac94b27d2a31ea10a7949fb21f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-06 04:46:03 +00:00
Marcus Tillmanns
74f15c99ce Terminal: Fix Ctrl+[A-Z] and '|'
Change-Id: Id245a015d6092236c20634c47af682bcf073d982
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-03-03 20:00:02 +00:00
Marcus Tillmanns
7fc674b566 Terminal: Fix "nano" titlebar
QTextLayout ignores trailing spaces, and does not draw their
background color. Converting them to Nbsp fixes this.

Change-Id: I19a363bcb4792c613eb9c59f7caaa40fa631b937
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-03-03 19:59:30 +00:00
Marcus Tillmanns
af520667ca Terminal: Defer scrollback text calculation
In high load situations, the conversion of cells to std::u32string's can
become a bottleneck. To address this, the calculation is deferred until
it is needed.

Change-Id: I0cc3c941fa680d8b9ebc3a5cba13cdc5c2db50f9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-03-03 19:59:08 +00:00
Marcus Tillmanns
dc4ec494b3 Terminal: Fix mouse selection
Previously m_selection was not correctly ordered such that start < end.
This patch fixes that and also adds optional debug visualizations to aid
in debugging / validating the selection.

Change-Id: I9b0d2fcd917f39eeb5082bc374796fed91521c7c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2023-03-03 19:55:05 +00:00
Tim Jenssen
3425b55352 qml2puppet: fix QtCreator branded builds
Task-number: QDS-9356
Change-Id: I6bb587a8a5c0d7d905725b1e145fcc9c11ac4994
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2023-03-03 18:19:51 +00:00
Mahmoud Badri
399cc372db QmlDesigner: Skip asset importer dialog when dropping an external asset
Fixes: QDS-9350
Change-Id: I7bef35350108580ef293160840a9e4174d1f6642
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-03-03 16:28:30 +00:00
Marcus Tillmanns
1d6c161124 Utils: Fix missing modeBase
Change-Id: I8ce9393ef97b83b9db8cde12cc8653e9072dad65
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-03-03 14:24:25 +00:00
Eike Ziller
89f98659ca Change filesystem locator filter to FilePath
Allows using the filesystem locator filter on remote systems.

Change-Id: I4753691cdc0ec8a0e598001371ff3cf6be44737c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-03-03 14:15:29 +00:00
Jarek Kobus
6efecebb10 ILocatorFilter: Provide default implementation for accept()
Change-Id: Ide3c65ac78da60c9634b8f1c3009e947e8f1e2f3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-03-03 14:06:17 +00:00
Jarek Kobus
215f79f580 LocatorFilter classes: Use more linkForEditor
Limit the usage of ambiguous internalData.

Change-Id: Ice67884b9fb2ff303939cd5998c6e80453e82530
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-03-03 14:06:08 +00:00
hjk
34fd28327d CMake: Use callback-based environment iteration
Hides underlying data structure.

Task-number: QTCREATORBUG-28357
Change-Id: Ib0d7fb70afa820b1bd28d23e12b9379a6de6546b
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-03-03 14:05:07 +00:00
Cristian Adam
6a41e33908 CMakePM: Use cleaned paths for CMake parameter values
FilePath::fromUserInput will "clean" the paths, which on Windows means
that \\ will be replaced by /.

This is how CMake treats the paths internally as CMake paths.

This fixes the %{buildDir} macro which will expand to \\ on Windows.
Which causes issues with qtcsettings.cmake.

This way the expanded value of CMAKE_PROJECT_INCLUDE_BEFORE is not
displayed as red on Windows in the "Current Configuration" settings
page.

Change-Id: Ic26bf437de41ff3fb1c1b98d304ae84512cb0f1a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2023-03-03 13:57:08 +00:00
David Schulz
9feef11b5d Copilot: robustify request logic
Change-Id: Ifa46bc05f0bab8e3c7fc40d855a35e940f0628da
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2023-03-03 13:34:40 +00:00
Mahmoud Badri
26b2b01ab4 QmlDesigner: Cleanup includes in assetslibrarywidget
Change-Id: I224b16cf34698ecdfe0b72a9c1d87bb17a92e56a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2023-03-03 12:32:39 +00:00