Commit Graph

80529 Commits

Author SHA1 Message Date
hjk
a2f0922334 CppEditor: Inline cppquickfixsettingswidget.ui
Change-Id: I5110e71122cbcb349d46945da8e7d7fb3733b691
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-11-18 07:24:48 +00:00
The Qt Project
cd68ffeac9 Merge "Merge remote-tracking branch 'origin/9.0'" 2022-11-17 15:57:52 +00:00
Eike Ziller
81629e9228 Merge remote-tracking branch 'origin/9.0'
Change-Id: Id7665d5a269ef58cbbb2dbfc1e5b0d1820c4e13e
2022-11-17 16:11:52 +01:00
Jarek Kobus
0a2213d359 TaskTree: Add default c'tor and setupRoot() method
Make it possible to setup root later, after TaskTree
was already constructed.

Change-Id: I59e8e6a12102f9b8ed0f40357ab12e47d67572c2
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-17 15:08:11 +00:00
Jarek Kobus
7ab95906b9 TaskItem: Move enums outside of TaskItem
Change-Id: If8a2b285bf9d9bd5a5b7222c13772c1a873daf23
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-17 15:07:59 +00:00
Jarek Kobus
a4b7e10861 TaskTree: Implement simple progress reporting
The progressMaximum is the number of tasks in tree.
The progressValueChanged signal is emitted whenever task is done
(advance by one) or when some number of tasks were skipped or stopped
due to workflow policy or dynamic setup group handler.

Change-Id: I403059a6466ae0534ef647c3c1c61c0318f10325
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-11-17 15:07:47 +00:00
Jarek Kobus
e38db06203 TaskTree: Add taskCount() getter
Will be helpful when implementing progressMaximum.

Change-Id: I9204b53425054a01c96f3b926b595f7888f81e3a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-11-17 15:07:34 +00:00
Jarek Kobus
234b3d1e6f TaskTree: Add DynamicSetup handler for groups
DynamicSetup enables finishing group (with Done or Error)
immediately before the group was even started.
The handler is invoked dynamically, just before starting
the group. The handler may also allow for running only
selected children and omitting others, so it may serve as
dynamic condition or dynamic multiplexer. This can be achieved
by modifying QSet<int> childrenToRun field inside returned
GroupConfig and setting the policy to ContinueSelected.

Change-Id: I15bddbb866a89ae9f783c59cc4bca89dd6a81c75
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-11-17 15:07:22 +00:00
Jarek Kobus
9e8d208cad CMakeProcess: Do some cleanup
1. Get rid of unused started() signal.
2. Remove lastExitCode() getter.
3. Add int exitCode arg to finished() signal.
4. Make some string variables const.

Change-Id: I3e9774f64a8f34fd2be4436d766285cad1c539a3
Reviewed-by: hjk <hjk@qt.io>
2022-11-17 15:07:10 +00:00
Jarek Kobus
165d364a6d CMakeProcess: Simplify implementation by using ProcessProgress
Change-Id: I9e9665f7e57ebb7d3028396e792161aa2c3a648e
Reviewed-by: hjk <hjk@qt.io>
2022-11-17 15:06:44 +00:00
Christian Kandeler
953000b981 CPlusPlus: Add new usage tag "Template"
For use in follow-up patch.

Change-Id: I49c057280be9b09862a89fa385a7396f1b1093bb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-11-17 15:02:09 +00:00
Tim Jenssen
409f7f226f deployqtHelper_mac.sh: make sdktool optional
Silents the warning about not existing sdktool
in QtDesignStudio build.

Change-Id: Ia8e3f341936f4b20d340f9c66a5da3d01f14bccf
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-17 14:21:53 +00:00
Marcus Tillmanns
d7869967ce ProjectExplorer: Remove duplicate devices
In rare cases it can happen that the installer creates a device that happens
to have the same rootPath as a user created device. We need to filter
these out since otherwise it can be random which of the two devices
is selected.

Change-Id: I8269795a2e4f439fb2f02d819272723a504c6703
Reviewed-by: hjk <hjk@qt.io>
2022-11-17 14:10:11 +00:00
hjk
e0b856f0b0 Debugger: Remove DebuggerCommand::arg(FilePath)
It's better when the user code has to be explicit in what
format and/or which parts of the FilePath is needed.

Change-Id: I9d70e073f853a1bbc47c8482ebe77d7c4612b4b7
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-11-17 14:03:57 +00:00
Thomas Hartmann
04864bd0d1 QmlDesigner: Show message when generating package
Task-number: QDS-6825
Change-Id: I4bc826789de51778f7e9ad1314f9b0e029c7949f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-17 13:51:08 +00:00
hjk
c5296c0bf6 Perforce: Inline submitpanel.ui
Some unusual stuff removed, some unusual stuff left in.

Change-Id: I53d9f4677540c2401d6ddfcd687b5f18c5f70667
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-17 13:41:27 +00:00
David Schulz
0e4b0a26d3 Editor: move ownership of assist interface to processor
This way the base class can manage the lifetime of the interface object
and it doesn't need to be done in each implementation of perform.

Change-Id: Ie1ce742e31b688a337533ee6c57d376146e25ace
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-11-17 13:23:55 +00:00
David Schulz
aa6633ca21 Utils: improve assert stack printing on windows
Ignore the two top level frames since those only contain the assert
infrastructure and indent the stack to make it better distinguishible
from the actual asserts.

Change-Id: I7aaa4996de5f96404bd3766310a3ae07616fb705
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-11-17 13:23:50 +00:00
Christian Kandeler
86770f28d0 ClangCodeModel: Keep a ref count for "extra files"
These are files that we temporarily report to the server as "open"
without actually having a document for them. Since this mechanism is
used in several places, we'd like to keep a consistent state even when
such actions overlap.

Change-Id: I0cfe3427740ec479926bc114848ad08f8866bdbb
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-11-17 13:15:03 +00:00
hjk
e202138fb0 Utils: Use QStringView in FilePath implementations when it makes sense
Change-Id: I7346d873008f8ff1ab88f298a8d90e41f8c6d0b9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-11-17 13:12:30 +00:00
Marcus Tillmanns
1ba366c5c0 Debugger: Fix environment when initializing
Previously when detecting / checking debuggers the process would be
started with the Host environment set. This was incorrect for remote
debuggers.

Change-Id: Icd210dbfc9437e9abd2e0c4248e5503129bf6d8b
Reviewed-by: hjk <hjk@qt.io>
2022-11-17 13:08:14 +00:00
Marcus Tillmanns
fb4e22ff7c Docker: Add option to enable flags needed for lldb
Change-Id: Ic0ae6d2b8dcfee3df21c22124c7fc2bddbdb61a2
Reviewed-by: hjk <hjk@qt.io>
2022-11-17 13:03:52 +00:00
Marcus Tillmanns
e3c2db8db5 lldb: Use path() for FilePaths from devices
Change-Id: Ib825fff472c327d4bde5caae7662b68c2911d2a2
Reviewed-by: hjk <hjk@qt.io>
2022-11-17 13:03:47 +00:00
Alessandro Portale
43ba40530c CMakeProjectManager: Set ANDROID_USE_LEGACY_TOOLCHAIN_FILE to OFF
Task-number: QTCREATORBUG-28442
Change-Id: I190ba68df5a71ae352c49c96a64e9a3777880368
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-17 12:56:52 +00:00
Mahmoud Badri
56fa49d8e6 QmlDesigner: Allow drag-n-drop a texture to the 3D Editor
Task-number: QDS-8207
Change-Id: I58bf2857e2ae1830b1dc48f352088c424d4e7c0d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-11-17 12:44:42 +00:00
Marcus Tillmanns
c699249bc4 QMake: Fix path cleaning
The .pro file path is QString compared when trying to import
an existing buildfolder. This broke since resolvePath() does not
necessarily clean the path anymore.

Fixes: QTCREATORBUG-28409
Change-Id: I10286f086762b8f8dd9020aa4003317ff6180e12
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-11-17 12:13:11 +00:00
Pranta Dastider
f6d878f037 QmlDesigner: Update the wrong Timeline option text
A text was not similar in the document related to
Timeline option. This patch solves the issue.

Fixes: QDS-8263
Change-Id: I34cdb99b6e60d8a0f91baa02d0660ac9e6981523
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-11-17 12:07:59 +00:00
Christian Kandeler
d97e9a81b0 qbs build: Don't build qml2puppet
Amends a0f356aed6.

Change-Id: Icb8a9b5e6163df79534f552e2dc84dade2bf5753
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-11-17 12:04:17 +00:00
Alessandro Portale
9fc27b3bb4 Utils: Fix "unused parameter" warning for non-macOS
Change-Id: I4dc8a02a0476a34535352b110e140d98077b59d5
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-11-17 11:47:51 +00:00
Miikka Heikkinen
69461e4c68 QmlDesigner: Generate material browser texture icons using provider
Provider allows using special generation methods for hdr images, which
QImage doesn't support.

Task-number: QDS-8296
Change-Id: I829199264ff4a5eb677d65c908eacd1e20ad94e5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-17 11:31:42 +00:00
Alessandro Portale
92f7da917e Debugger: FilePath-ify .so libs handling
Side-effect is the stabilization of the order in which the paths are
passed to the debugger (was random, before).

Change-Id: I2dba3ae6f2feef57b26eab93dee0903ee2f93dde
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-11-17 10:24:07 +00:00
Alessandro Portale
9f397de829 Utils: Don't reverse FilePath::dirEntries result by default
QDir::NoSort has the value -1 thus all sort bits set.

Change-Id: I543fa68b11269cd4321b22113fc591f5542c2edd
Reviewed-by: hjk <hjk@qt.io>
2022-11-17 10:23:32 +00:00
hjk
f59ca97a84 Utils: Sanitize FilePath::onDevice()
It's one entry in the FilePath world, so it should start with a QString.

Change-Id: Ib2693f52d56103a4c37ba7361b191c2a5c2a72f8
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-11-17 10:13:05 +00:00
David Schulz
895f88f63a ProjectExplorer: create a root path without scheme for host device
Change-Id: I966db6378dca533c73635803fb177d31b2c625ac
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-11-17 09:39:35 +00:00
Marcus Tillmanns
74d915d6aa Docker: Add default search path for docker binary
Change-Id: I86e02f726e9dac7302c3435f53fdb47c70fffafd
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-11-17 09:11:58 +00:00
Jarek Kobus
1ecde217a0 QtcAssert: Print the time of log
Sometimes, after I close Creator, I notice a bunch of logs
being written to console. However, I really don't know when
these logs happened - on close of Creator of much earlier
(e.g. 1 hour ago). Having times in log may help to link
the log content with the recently executed actions inside
Creator.

Change-Id: Id53c1eecd315917211b04adbd82669eb8865be81
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-11-17 09:09:15 +00:00
Miikka Heikkinen
96b0cda1c9 QmlDesigner: Don't write zero position properties at node creation
Some types do not have x/y properties, so don't write them at node
creation. Also, if the value would be the default zero, it is
unnecessary to write them even for types that support them.

Fixes: QDS-8304
Change-Id: I75218d599288cc79e3a390f68255cc6769df4083
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-11-17 08:34:18 +00:00
Tim Jenssen
213d60ad64 Merge remote-tracking branch 'origin/qds/dev'
Change-Id: I74bf2bfb1eacb60675640c47eb41ce51dd6eb99f
2022-11-16 18:22:59 +00:00
Thomas Hartmann
2a44f8caaf QmlDesigner: Fix shaking items when scrubbing the timeline
The reason for this is that when scrubbing the timeline,
the bounding rectangle can change a lot (See bugreport).
If this is the case the pixmap and the bounding rectangle get temporarily
out of sync, which leads to the shaking.
In this patch we add the bounding rectangle to the pixmap command.
The bounding rectangle coming with the pixmap has higher precedence.
This means if there is a pixmap, then the pixmap is always in sync with
the pixmap. If there is no pixmap we use the "original" bounding rectangle.

Task-number: QDS-7828
Change-Id: I40c0b7ed97863b9dca726547927ae1a37f9c415d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-16 17:51:28 +00:00
Tim Jenssen
f6cfe31c7f qmldesigner: increase restart timer
It was looping in debug on Windows so heaviliy
that it brought the system to hold then.

Change-Id: I10eccb6c48a22ba7a9de912a912f957066bf9c09
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-16 17:35:17 +00:00
Thomas Hartmann
6296b9a1a4 QmlDesigner: Add option for Always auto-format ui.qml files in Design mode
Task-number: QDS-8170
Change-Id: I6e345c69e60a19fd8eb7a505d7f64cb5fd664c88
Reviewed-by: Pranta Ghosh Dastider <pranta.dastider@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-16 17:31:59 +00:00
Thomas Hartmann
cbd96ef312 QmlDesigner: Fix crash
The timer can timeout after a detach.

Change-Id: I7eafe0a3d666942841cc0ee64d850acfab418c7c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-16 17:31:14 +00:00
Thomas Hartmann
626e1175a6 QmlDesigner: Do not specify version if it is -1 -1
Otherwise isBasedOn works differently than isSubclassOf for file components.
File components do not have a version.

Change-Id: If7009538ef97d119a348da99ed07919136c8b6e1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-16 17:30:42 +00:00
Vikas Pachdha
7a65a16718 Designer: Assert url scheme of the component
Type is not parsed if the url scheme is incorrect

Change-Id: Ia5cdf2887c73769a3c1bb6d8965426b0ff7e688c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-16 16:35:04 +00:00
Vikas Pachdha
913d0e079a Designer: Fix missing semicolon in case of dynamic properties
Fixes: QDS-5457
Change-Id: Ib6be3ec864ffb972010e25c2fa956695201dba2c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-11-16 16:34:59 +00:00
Jarek Kobus
9381429e4f Perforce: PendingChangesDialog: Use Layouting
Change-Id: I0c4ea45f89b694df89ec304171779cb1b796280f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-11-16 15:37:38 +00:00
Jarek Kobus
46183c88d1 Perforce: ChangeNumberDialog: Use Layouting
Change-Id: Ib18c4b2533b87f7afcd5f61053b487a3c35427a2
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-11-16 15:37:30 +00:00
Eike Ziller
478ce3f4a4 QmlDesigner: Fix condition for adding QMLDESIGNER_STATIC_LIBRARY define
"$<BOOL:" interprets the following string, and does not expand variables
itself.

Amends 78cf5051f5

Change-Id: I50e09e699764a00091167e8c72045a0f9055160e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-16 15:37:26 +00:00
hjk
dd4c47a73a QmlDesigner: Avoid warning about unsed parameters
Change-Id: I5a61faa1e876ad31fa6d275157cf55b8549142bd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-11-16 15:35:32 +00:00
Tim Jenssen
0d2cb70fd6 qml2puppet: fix broken deployqtHelper_mac.sh
The extra subdirectory "qmldesigner" was removed
in cmake build scripts by last refactoring.

For other ui helper tools in libexec is already a
working qt.conf which can be reused.

Task-number: QDS-8308
Change-Id: I7e98d0187cf2748298da263e55a64918cbb6b2c0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-11-16 15:35:01 +00:00