Commit Graph

74059 Commits

Author SHA1 Message Date
Mahmoud Badri
c9b140eb7e QmlDesigner: Correct asset to material editor dnd behavior
Only check the first asset when dnd multiple assets to be in sync with
the dnd handling in the QML side after drop.

Change-Id: I32ecf6be87284dc8e32f51f674ba082fab7cad7a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-05-31 13:06:01 +00:00
Miikka Heikkinen
c789186418 QmlDesigner: Handle picking of models under View3D component properly
If a model defined inside the View3D component is picked on 3D editor,
the parent View3D is selected instead as there is no instance for
the model itself. This is similar to how Node based component picking
works.

Fixes: QDS-6934
Change-Id: I4f273972da8cb1c55f03cab323dd9804a5d10def
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-05-31 12:02:49 +00:00
Christian Kandeler
b1e73ca45d ClangCodeModel: Try harder to catch bogus AST ranges
String literals that are adjacent after preprocessing are reported as a
single AST node, leading to potentially wrong highlighting.
We can catch this condition at least for the case where there are
semantic tokens in between the string components.

Fixes: QTCREATORBUG-27601
Change-Id: If023d06db74bd6cfefa670649f0e733ceaaede2d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-05-31 11:38:41 +00:00
Jarek Kobus
fc2f3983bc QtcProcess: Don't merge ready read signals
We store pointers to signal objects inside m_signals list,
so we can't easily merge the old ready read signal with
the new one, since when flushing the m_signals from the main thread
we are taking copy of m_signals, but this copy still holds
the pointers to the original objects, and using them outside
of locked mutex isn't safe.

The possible solution would be to store simple data structures
instead of signal objects allocated on heap. However, there is
not really much gain of merging the ready read signals, so we
get rid of it.

Task-number: QTCREATORBUG-27578
Change-Id: Idd19a6fc1ebb4ccab1e4e367cfeb3f2f02a35512
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-05-31 11:27:14 +00:00
Christian Kandeler
6e358cbdd4 CppEditor: Switch off "remove using namespace" quickfix with clangd
There is an equivalent tweak in clangd.

Change-Id: I895750f1e942f82da94f441b56b8a7d660ba7086
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-05-31 11:16:50 +00:00
Christian Kandeler
51b6aa7649 ClangCodeModel: Move highlighting code into its own set of files
No functional changes.

Change-Id: If6e5da7e79bf39e564f0f38520ae088f76543642
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-05-31 11:15:13 +00:00
Christian Stenger
dd27901759 GitLab: Allow fetching events
Projects that are linked to a GitLab instance will now fetch
notifications for this project and print them to the vcs output pane.

Change-Id: Ifb960e64b30a260327efb28a3dfd26f6457503a0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-05-31 10:47:11 +00:00
hjk
cd1af2864b ProjectExplorer: Slim down PEPlugin::runningRunControlProcesses()
Accessed only from the (semi-dead) GammaRay plugin which does not really
use it.

Change-Id: Id4149a23869a8d9ceb1c31a3a380bbad32e3981b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-05-31 10:34:19 +00:00
hjk
b17bbcff38 Debugger: Use USVC extra data more directly
Not nicer, but more similar to the rest of extra data, so one
approach less.

Change-Id: I2c9a3a041ab3f017f3350c0399d57feeb422048c
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-05-31 10:16:57 +00:00
Christian Stenger
dcfa15ff17 GitLab: Allow browsing and cloning projects
Change-Id: I1cc877ea6b5a55ae7bdb8e7a529afeb08d09e0c0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-05-31 10:13:06 +00:00
Miikka Heikkinen
9b5c8448f0 QmlDesigner: Fix 3D application wizard quick3d import version handling
Change-Id: I80eecdcd5ac9938715b084bd8b89c82d62aa7323
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-31 09:12:16 +00:00
Mahmoud Badri
175343e24a QmlDesigner: Highlight material editor properties upon asset drag
When starting an asset drag in the assets view, highlight all
supported properties in the material editor.

Change-Id: I60935756e4c1384edcc284068163d08ebe529a05
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-05-31 08:57:43 +00:00
Christian Stenger
b336ebafc3 QmlPuppet: Silence warnings
Change-Id: I25ebc3b33d5e636176f87af35ee2316e302f233a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-05-31 08:32:29 +00:00
Jarek Kobus
add9abd672 GenericDirectUploadService: Fix error handling of stat process
Don't rely on error detection based on error string contents.
The translators may have provided empty strings (by mistake) and
this may influence the behavior.

Change-Id: I035ead2ddd93787b268798607d3f856981f0c862
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-05-31 08:24:00 +00:00
Jarek Kobus
a7fa8c46ee LinuxProcessInterface: Fix error reporting on failed to start
Change-Id: I2af4a13289458e6270452a254cf90f7bd9cc3684
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>
2022-05-31 08:12:48 +00:00
Jarek Kobus
21d3f0d51e LoadCoreDialog: Use FileTransfer for download
Change-Id: I032eceb85af3416e2488f8ba34ef4092f4aacd8d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-05-31 08:12:41 +00:00
Jarek Kobus
8a1f091bf0 SftpFileTransfer: Fix error reporting
Use "-b" option of sftp command for providing batch file
instead of setting a standard input file for sftp process.

In order to fix showing the authentication dialog
we explicitly pass -o BatchMode=no before the "-b" option,
which should re-enable the interactive mode before
processing batch file.

Change-Id: Iaf3c93929c08fd61373003e394a08439d05fe27e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-05-31 08:12:33 +00:00
Henning Gruendl
0a84ef4b2c QmlDesigner: Refactor ImageCache
Move the ImageCache from the ItemLibraryView to a
more centralized location.

Change-Id: Ic0721976650dad8af26c29b50fed8aec0fffbf75
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2022-05-31 08:06:10 +00:00
hjk
1976630bbc Valgrind: Inline ValgrindToolRunner::executable
Change-Id: Ia714a5a322ae56b07360871f584ec6f9f1babb5b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-05-31 07:58:46 +00:00
hjk
6431b02947 ProjectExplorer: Derive RunControl::displayName from exectuable
Unless explicitly provided. Less user code.

Also, de-virtualize RunControl::displayName, it's never overridden.

Change-Id: Ibd315aac3c478d993e984af20f7df9077dffe634
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-05-31 07:58:39 +00:00
hjk
1ffe32187a ProjectExplorer: Remove RunWorker::runnable()
A convienience function that leads to an interface that's "too stiff".

Change-Id: Ide2e5fd991707d08690e7e384e9048a30e0828f4
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-05-31 07:36:38 +00:00
Aaron Barany
449334e419 LanguageClient: Avoid crashes when language client is invalid
This can occur in situations such as clangd crashing. A similar guard is
used in the perform() function, but can still crash in cancel() or
handleSignatureResponse() if the client is destroyed beforehand.

Fixes: QTCREATORBUG-27096
Change-Id: Ib33d306c5411bc31bc13de399e6c2ad0a89462f4
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-05-31 07:14:20 +00:00
hjk
bc3c4d7453 Dissolve RunControl::setRunnable
Change-Id: I52aea3bea0c4ea90a448f5a77bfa01414bc56702
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-05-31 07:13:05 +00:00
Thomas Hartmann
255f7f836f StudioWelcomePage: Disable data download by default
QML/Designer/EnableWelcomePageDownload is not set,
no download or probing will start.

Change-Id: Icadd29b2a8c0439ebd8435b987647f5d6f7167a7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-05-31 06:54:42 +00:00
David Schulz
3ad82a66f9 Python: move pyside detection to runconfig
Change-Id: I781c4d005ced0c884081616696eae7f738f38c6f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-05-31 05:59:45 +00:00
hjk
0f470982de PerfProfiler: Remove now-useless check for process success
The check nowadays always succeeds, the potential failure is handled
in the normal done() handling.

Change-Id: I858633871a6b66817c795e7057964afebf79eb85
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-05-30 16:19:14 +00:00
hjk
a33594fa76 QmlDesigner: Sprinkle code with Q_UNUSED
Less noise when compiling.

Change-Id: I7cac44912d5d5165f25ce411db6c6de486688c45
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-05-30 14:50:42 +00:00
hjk
2837f4d777 ProjectExplorer: Pass macroexpander (again) to WorkingDirectoryAspect
Broke with 8dacb123e0.

Probably calls for a more centralized approach again. Later.

Change-Id: Ibf52487d68d7938d4b5dfb38f1f0a5b0e1a97bc3
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-05-30 14:45:47 +00:00
Miikka Heikkinen
f6fdcfef53 QmlDesigner: Remove a couple of work around puppet resets
The issues that were worked around by these resets have been fixed.

Fixes: QDS-7009
Change-Id: I7940b55c3f3edcfdcde9ad5f41cfa1d188d2bc96
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-05-30 14:23:10 +00:00
Miikka Heikkinen
80ea026fd8 QmlDesigner: Refactor library icon generation for imported 3D assets
Previously, icon generation was done at import time, but that was
wasteful, as we now have image cache backed icon generation
available for component library icons. Added the few remaining missing
bits to support icon generation for image cache and disabled the old
icon generation implementation for Qt6.

A few issues in fit algorithm for preview image generation were also
uncovered and fixed to make icons render scene in comparable size to
the old version.

Qt5 imports still generate using old way since component library
3D previews generation doesn't work on Qt5.

Fixes: QDS-6205
Change-Id: I5418fa19d86e81adcd184be023f1dfbc813d0bf5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-05-30 14:16:53 +00:00
Miikka Heikkinen
46049bac32 QmlDesigner: Remove hardcoded timeout from 3D import puppet
It doesn't seem that this timeout is needed.

Fixes: QDS-6909
Change-Id: I7794d8548acd75fbb220a20458d091f413b5fcbb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-30 14:16:27 +00:00
hjk
17ee387756 ProjectExplorer: Dissolve a few uses of Runnable
Change-Id: I71b8f1b00e488360e7f9c136912bc64b5a76609a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-05-30 14:10:59 +00:00
hjk
d325f56cc1 RemoteLinux: Prepare new aspect data extraction for X11Forwarding
Following the ArgumentsAspect precedence for MacroExpander.

Change-Id: Id3f58a994eb03911f7c864d66e06cf9571a1e3db
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-05-30 13:41:32 +00:00
hjk
aa5e39d7bf ProjectExplorer: Remove Runnable::device
Not used anymore.

Change-Id: Ic22037d67df890b8fb46bf0dcb6b6513dddddb14
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-05-30 13:02:16 +00:00
Eike Ziller
dc8faf2964 Merge remote-tracking branch 'origin/8.0'
Change-Id: Ic16fdc48fe2d71f82893f2d8e047259a42fe8a79
2022-05-30 14:51:12 +02:00
Adam Treat
190988bd0b Docker: Remove the dependency on docker for the kit detector
This is in preparation for perhaps moving the kit detector into another
plugin such as project explorer for usage by remote linux devices for
instance.

Change-Id: Ie17ab3913aed9ccc895213882cd188c16affda15
Reviewed-by: hjk <hjk@qt.io>
2022-05-30 12:49:29 +00:00
hjk
99c37ab7b7 ProjectExplorer: Remove RunControl::buildType()
Apparently unused.

Change-Id: I3aac506750735a465d787efeb9ea6a6de6e2c6a1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-30 12:41:13 +00:00
hjk
ce2c072e8e ProjectExplorer: Replace one more use of Runnable::device
Change-Id: I58c7b28be9fa54637288099bfca3912d2b7f4935
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-05-30 12:22:52 +00:00
Adam Treat
b7131d34db Docker: Set a default mount to the project directory
Change-Id: I35a7d7f28ffc340cd2825a4ed355f0e94bb94e8b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-05-30 12:14:41 +00:00
Eike Ziller
09efabaf89 Merge remote-tracking branch 'origin/7.0' into 8.0
Change-Id: I3780a56c1e02c2e98028aaf02b54733c6f222498
2022-05-30 14:14:04 +02:00
Artem Sokolovskii
675bff46da iostool: Remove foreach / Q_FOREACH usage
Task-number: QTCREATORBUG-27464
Change-Id: I26decce7cc8748c9707fb5aae9566bab89e73e25
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-05-30 12:09:23 +00:00
hjk
2af3b41ad6 ProjectExplorer: Replace some uses of Runnable::device
Change-Id: I76ccbe9a56b9ecdc07fc85885b34f2a31c69fc07
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-05-30 12:00:47 +00:00
hjk
8badc4669e ProjectExplorer: Avoid use of Runnable::device
Derive it from the command's filepath instead.

Change-Id: Icb37bc0cbf449459902f24e53df9f81473e97b7b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-30 11:54:56 +00:00
hjk
1a81551b9d ProjectExplorer: Cleanup runcontrol.h
Change-Id: I8dbf14af221831ce3f55522c5e33c736e8748566
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-30 11:51:12 +00:00
Artem Sokolovskii
f7097cef19 CPlusPlus: Remove foreach / Q_FOREACH usage
Task-number: QTCREATORBUG-27464
Change-Id: I62e27bca141a529ac220211f8b31e78be0f7e855
Reviewed-by: hjk <hjk@qt.io>
2022-05-30 11:43:55 +00:00
hjk
67fdb23001 ProjectExplorer: Remove one use of Runnable::device
Change-Id: I0cbaf3ab73687adf11966bc291be27171e50b232
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-05-30 11:27:23 +00:00
hjk
554c10ed41 Compile fix, add missing #include
Amends 4520f93f2e.

Change-Id: I4bde1bd6c8842053150854735aa70fcf5bbf0da7
Reviewed-by: hjk <hjk@qt.io>
2022-05-30 10:55:30 +00:00
hjk
4520f93f2e ProjectExplorer: Replace remaining uses of Runnable::device
Change-Id: I2d42269eb6ad971fcedb118acb7e6e1dfbff83b2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-30 10:49:44 +00:00
hjk
3653456c4f ProjectExplorer: Remove unused Runnable::displayName
Change-Id: Iae9377f1d4f555a666fb523dda0972ac541c2aa2
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-30 10:21:04 +00:00
hjk
b47b95394b Valgrind: Replace one use of Runnable::device
Change-Id: I8b4ae375ec2835b8d04d08eab528cac9755ee811
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-05-30 10:18:09 +00:00