Commit Graph

76686 Commits

Author SHA1 Message Date
David Schulz
4612a052f4 TextEditor: fix typo
Change-Id: Ibad6729f5281a1b7036af7483a82eae7e22649a5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-13 08:26:38 +00:00
Thomas Hartmann
13c1b6f237 QmlDesigner: Do not apply smooth rendering if root is a 3D node
Task-number: QDS-7136
Change-Id: I5260153b8d6131160a8d4b67418e81c6f6e4d862
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-06-13 08:12:39 +00:00
Christian Kandeler
e128c8cbde CppEditor: Fix looking up containing function for search result
- Move look-up to CplusPlus::FindUsages, where we are guaranteed that
  we actually have the document source.
- Use the same straightforward algorithm as with clangd.
- Undo the changes to CppDocument::functionAt(), which broke
  the autotest.
Amends 6f7e7980d2.

Change-Id: I008d05ba41a3b63b71e3131d7021e0d4e7d0641f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-13 06:54:58 +00:00
Eike Ziller
cf0fa99e85 Merge remote-tracking branch 'origin/8.0'
Change-Id: I2a2fdbfdaf5117de582e7e091e3913a55e225173
2022-06-13 08:36:31 +02:00
Eike Ziller
737877984d Use QTEST_GUILESS_MAIN where applicable
instead of QTEST_MAIN. Reduces the initialization that is done by the Qt
test applications, and can also reduce interference with normal OS
operations like the current window loosing focus.

Change-Id: If88f289281aa1c8703ac7d4dbe0799d067c16588
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-06-13 06:06:44 +00:00
hjk
e2e5d67bc3 ProjectExplorer: Use FilePath in installRoot machinery
Helps to get path delimiters right.

Change-Id: Ifaab593a530c667488b7b5e6546041d8c212ece8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-06-10 14:03:09 +00:00
hjk
eb886ad40b ProjectExplorer: Use CommandLine in MakeInstallCommand
Instead a FilePath/QStringList pair.

Change-Id: I55340795266699e448ec1e17681a5e788eaae37a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-06-10 14:02:50 +00:00
Eike Ziller
fc636755af Fix crash of tst_ImportCheck
We don't have a PluginManager instance when running the autotests.

Change-Id: Ib36ea2bb58e500a2ad4b601cedfb8d426fda7e4e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-06-10 13:21:28 +00:00
Miikka Heikkinen
dedbbc75b5 QmlDesigner: Apply root item transform in Node component previews
When generating a preview from a component with a 3D node for a root,
the root Node transform is now applied when calculating camera zoom.

Fixes: QDS-7131
Change-Id: I73054a09b3e82868c999ef6f9797dc941e625b33
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-06-10 13:15:05 +00:00
Christian Stenger
d06d6ebeba GitLab: Fix reflecting port data inside ui
Set values did not show up inside the ui. Likely a redo of
the options page would be more appropriate, but for now the
quick fix should be good as well.

Change-Id: Id782ba48ea4dee08b2c6720cdf9e78350f1e9a47
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-10 12:57:44 +00:00
David Schulz
99acc9a153 Python: Fix python detection for non project files
Do not return an empty file path if we cannot find a python venv for a
file path, but also consider the configured interpreters.

Change-Id: I5a7f06e394fb925f9a00143fc5f0797e8754534b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-10 12:47:29 +00:00
David Schulz
4c20a880e6 Python: remove python specific language client settings
Change-Id: Ic993d525f29c1925f7e64dfc6f5e053234fb4904
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-10 12:47:23 +00:00
David Schulz
ed22ef7854 Python: globalize Python language server settings
Change-Id: I84fcee6462064f0c788492fcfa12a77379af2bd7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-10 12:40:43 +00:00
Christian Stenger
e42ff3f14e GitLab: Allow localhost for server
Change-Id: I026f6a72c9eb0b377319fca847062885c666ed4a
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-10 12:27:56 +00:00
Christian Stenger
0cfd264279 GitLab: Handle certificate issues
Allow to bypass certificate verifications.
Currently the bypassing is not stored into the settings,
so this is not permanent.

Change-Id: Ieb564464a28cf2d4973c6b1baa696d6c22b07177
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-10 12:27:45 +00:00
Christian Stenger
fdb413c9a7 GitLab: Support unsecure http as well
Change-Id: Idfb4faf1cbfbfd6c2914b057e6c76461de0ceeff
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-10 12:27:30 +00:00
hjk
6674e5f267 Docker: Remove DockerBuildStep
That was part of the initial Proof of Concept and is not needed anymore,
the normal build steps can nowadays be remote.

Change-Id: Ic69ff89ebdcf8e6aef73d71954a48501c68c60ff
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-10 12:25:28 +00:00
Piotr Mućko
1c4abbf069 McuSupport: Auto manage memory of McuPackage's version detector
Use smart pointer for member of McuPackage.

Change-Id: I2474fc791b91c489be77aee3aab86401aaef76e8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-06-10 11:19:49 +00:00
hjk
8b6aeb9d16 Utils: Use case folding instead of toUpper for hashing file paths
Change-Id: I680db342b6b0b2433951064bb236ef7efadabf3f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-10 11:02:41 +00:00
Christian Stenger
6e57bedf69 QmlProjectManager: Fix compile
Amends 82911d2ec3.

Change-Id: I31bb8d88911837fca117ea76f8c474c555f9e59e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-06-10 10:06:38 +00:00
Eike Ziller
f1024bd5b1 EditorManager: Limit number of splits
To something large, but limit it. Having many editors open for the same
document can be a strain on slower machines.

Fixes: QTCREATORBUG-27568
Change-Id: I7074fc2c8eae1f4ccaa14a9a48b01afede454b0a
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-10 09:33:55 +00:00
Miikka Heikkinen
36dbc62a1d QmlDesigner: Queue puppet processes during import
On some systems launcing multiple simultaneous import processes causes
imports to fail. Fixed by only launching single process at a time
and queuing the rest.

Fixes: QDS-7107
Change-Id: I330c5920dcbd74d3b4f2e7f40899795a4fbaf3ac
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-10 09:31:03 +00:00
Thomas Hartmann
d8c605179a QmlDesigner: Add option for smooth rendering in form editor
Smooth rendering turns on MSAA and doubles the resolution for
rendered items. With this option enabled everything stays smooth when
zooming in. Around factor 8-10 pixels become clearly visible again, but
it still looks relatively smooth.
I added both MSAA and increased the resolution to one option, for simplicity.
The smooth mode takes 4 times the shared memory, which should not
be an issue in most cases.
For now, the option is not the default.

Task-number: QDS-7129
Task-number: QDS-7128
Change-Id: I8a778650bb40f8ba796960db9bc966e8a1efff4e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-06-10 09:04:11 +00:00
Christian Kandeler
9ee60ecd87 ClangCodeModel: Derive displayed search term from adjusted cursor
Otherwise, we can have discrepancies between displayed and actual search
term.

Change-Id: Iadd2ec54db4cef4b103c3c0ef98eb47828ea544b
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-06-10 08:57:04 +00:00
Christian Kandeler
428a2c3c14 ClangCodeModel: Another cursor adjustment
Change-Id: Ie4859a52b12b3e87a65bd8c04e0123e6f34a9e73
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-10 08:56:44 +00:00
Christian Stenger
146c277837 AutoTest: Unify framework and tool naming
Use the same name for the test framework or tool across
Qt Creator.

Change-Id: I3116644ab03cc46c2e9d7e8aa3b8af8a5386dba4
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-10 08:47:12 +00:00
hjk
e3bb14d0d2 Docker/RemoteLinux Fix file size and permission retrieval
When a file path is a link, give the result of the dereferenced
link. This is what QFileInfo does locally.

Change-Id: I26ca1fb70d3391da77f2a5845e5f0a2c0fb73d53
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
2022-06-10 08:18:06 +00:00
Tapani Mattila
82911d2ec3 QmlProjectManager: Add .qmlproject file generator
Task-number: QDS-6993
Change-Id: I033b0efeea87e8eab3238d3ce8d5f25752822e36
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2022-06-10 08:06:59 +00:00
Eike Ziller
0f2adef192 Merge remote-tracking branch 'origin/8.0'
Change-Id: Ie0362c57fd7c21844452919e3d843a5321c103c3
2022-06-10 09:44:07 +02:00
Jarek Kobus
dec3fb7503 DeviceProcessesDialog: Fix a leak of DeviceProcessList
Fixes the following printout on Creator shutdown when
LinuxDeviceProcessList was used:

[launcher] "qtc.utils.launcher: \"Shutting down while process
/usr/bin/ssh is running\"\n"
SOFT ASSERT: "m_handles.isEmpty()" in file
/home/jarek/dev/creator-8/src/libs/utils/launchersocket.cpp, line 533
Destroying process launcher while 1 processes are still alive.
The following processes are still alive:
   "/usr/bin/ssh" QList("-M", "-N", "-o", "ControlPersist=no", "-o",
   "PermitLocalCommand=yes", "-o", "LocalCommand=echo", "-o",
   "StrictHostKeyChecking=no", "-o", "Port=22", "-o", "User=jarek",
   "-o", "IdentitiesOnly=yes", "-i", "/home/jarek/my_test_key/test_key",
   "-o", "BatchMode=yes", "-o", "ConnectTimeout=10", "-o",
   "ControlPath=/tmp/QtCreator-EACYSH/cs", "127.0.0.1") in thread 0x1d62b98

Change-Id: Ib64de5d4651b78fb313d7affa88f3f796953382e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-06-10 07:42:47 +00:00
Mats Honkamaa
8ca39444f4 Doc: Add documentation for Material Editor and Browser
- Add Material Editor and Browser docs
- Reorganize and edit current materials docs

Task-number: QDS-6991
Change-Id: Ibea128dc48c0c2e167abf36e7700d4516673b45b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-06-10 07:29:20 +00:00
Jarek Kobus
198aa551b2 MakeInstallStep: Fix error messages
Change-Id: Icc63b7765c421324ca6173f2d628653d361c3d85
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-06-09 15:28:01 +00:00
Jarek Kobus
97ec19a4f5 CheckForFreeDiskSpaceService: Fix error message
The message is shown e.g. when trying to run an app on remote
device when ssh service is not running.

Change-Id: I2db06cf8e999d55e7c822c14168185d07e0c3286
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: hjk <hjk@qt.io>
2022-06-09 15:27:52 +00:00
Thomas Hartmann
ab635dd4b2 QmlDesigner: Do license check only once
We should only make the license check once.
An evaluationLicense is handled as enterprise license.

Change-Id: Ib4b53795a7d735c10b5238f1e7b76346a9bcc8e1
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-06-09 14:27:29 +00:00
Christian Stenger
a63d27dc52 Utils: Fix qbs build with Qt6 on Win
Change-Id: Ib42b0e1a70399430bc84f62ca32c6c05efced176
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-06-09 12:53:36 +00:00
Leena Miettinen
90fba1a184 Doc: Update Clang Format options
Some settings were changed.

Task-number: QTCREATORBUG-26948
Change-Id: I4f3453907351cd30b1e0170be626889f429b33c8
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2022-06-09 11:57:18 +00:00
Leena Miettinen
a0e0d51a35 Doc: Describe advanced editing options for selected lines
Move "Multi-Cursor Editing" to "Working in Edit Mode" from
"Refactoring".

Task-number: QTCREATORBUG-27560
Change-Id: I177fd0ca56a4e7f05e70f67247348c531b045d98
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-09 11:17:38 +00:00
Alessandro Portale
79d08bd5dd Tracing/QmlProfiler: Fix deprecation warning with Qt 6.3+
From Qt 6.3 on, QSGMaterial::CustomCompileStep is deprecated and
QSGMaterial::NoBatching should be used, instead.

Change-Id: I27b2fd2e8b86de85ec88ab81b90e056005a4986d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2022-06-09 10:07:17 +00:00
Marcus Tillmanns
16c10cc913 DeviceShell: Don't use 'command' to test for base64
On (debian based) linux the "command -v base64" did fail to find
the base64 exectuable. Instead we now use "which".

Change-Id: I9b57527d93952b08bcb9abc7484a7e6891aa664c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-09 08:17:16 +00:00
Thomas Hartmann
a5d501d22e QmlDesigner: Fix template
Add missing '}'

Task-number: QDS-7125
Change-Id: I7ecf80d681de0400368e28b98179488db560381e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-09 07:32:44 +00:00
Assam Boudjelthia
1cf9d06675 Android: update NDK version for latest Qt version (Qt 6.4)
Since Qt 6.4 is built with NDK r23b, use that by default for
user apps as well. This is also needed to account for QTBUG-102972.

Task-number: QTBUG-102972
Change-Id: Id8485e0477b5e36c4d895582f5700c1f16b5a0c5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-08 21:07:43 +00:00
Henning Gruendl
519f6fbda1 QmlDesigner: Add drag'n'drop to PropertyEditorView
* Implement drag and drop for UrlChooser and FontComboBox
* Change the style of controls accepting drag payload and drag hovering.
  Utilize states for those styles.
* Fix aspect ratio of drag pixmap
* Fix issue that causes drag to continue after pressing the escape key

Change-Id: I5cf67175abe936e60e8af00fa8c2f7a2dec355b3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2022-06-08 17:30:10 +00:00
Henning Gruendl
bd51b4fdc2 QmlDesigner: Add tooltips to UrlChooser
* Add tooltips with thumbnails to UrlChooser enable preview of image
  formats and meshes
* Add property editor image provider which makes use of the image cache
* Add mesh image cache collector in order to create thumbnails for
  meshes and built-in primitves
* Fix typo in explicit image cache image provider
* Add return value in time stamp provider if provided file does not
  exist

Change-Id: I2290d2ace87ddd90e9899e343f2ad1ecd2993fdf
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-08 17:30:01 +00:00
Henning Gruendl
1c6fa83648 QmlDesigner: Change FileResourcesModel
Change FileResourcesModel to have one list of FileResourcesItem with
properties absoluteFilePath, relativeFilePath and fileName instead of
having two separated lists.

Change-Id: Ib4b4884a6739658434844d2adb9c05c3871104e7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-06-08 17:29:49 +00:00
Henning Gruendl
2e5892fbf0 QmlDesigner: Fix node component missing state prop
Fix node components not showing the states property in the property
editor. This is caused by querying majorVersion instead of
majorQtQuickVersion.

Task-number: QDS-6981
Change-Id: I0a87d921ce985f7fd58b92f526531c49622bb235
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-08 14:07:53 +00:00
Artem Sokolovskii
6d1478e1db Clang Format: Fix misplaced cursor after undo
Fixed behavior, when after undo function cursor, jumps
to the start of a file.
Join the undo block generated by auto format with the
last available undo block. This will place the cursor
at the last edit position instead of the document
beginning when triggering undo.

Fixes: QTCREATORBUG-27608
Change-Id: I1bb630af00e997ac53f178594445293ceebcfa26
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-08 13:17:18 +00:00
Thomas Hartmann
55cf108f96 QmlDesigner: Update QDS version in template
Change-Id: I0bfbd469d49568ec2be0b6b936c46bbc9160fbcb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-08 13:10:30 +00:00
Thomas Hartmann
9bd51f3d55 QmlDesigner: Make text label visible in 3d wizard
Task-number: QDS-7054
Change-Id: I44a2d01c799b619b553c6b1e76c003324e7b80ba
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-08 13:10:06 +00:00
Christian Stenger
d291008322 GitLab: Display link to global settings in project settings
Change-Id: I18208c44f9538c31fae4df61f2e0d93c1efcc319
Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-08 12:39:33 +00:00
Orgad Shaneh
dd7dd3462a Utils: Fix MSVC warning
incompatibility between int and quint64

Change-Id: If85eb13e4c6ff68a9b02dc036a971f03bab73d1b
Reviewed-by: hjk <hjk@qt.io>
2022-06-08 12:19:11 +00:00