Commit Graph

76860 Commits

Author SHA1 Message Date
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
Jarek Kobus
de6fd1b1b1 QtcProcess: Refactor killTimer
Before we were installing the timer inside the process
interface handler. The issue was that when the handler was
moved into another thread, the timer was restarted (that's
what happens with all timers when they are moved into another
thread).

The fix is to keep the timer inside the caller thread and
detect inside waitForSignal() whether a timer was started.
In case the remaining time for kill timer is less than
a timeout for waitForSignal, we split the waiting into two
parts and execute kill() in meantime.

Change-Id: I2c18805593fe2f73d816cce40dbb45bf58a50715
Reviewed-by: hjk <hjk@qt.io>
2022-06-08 12:13:13 +00:00
Jarek Kobus
224f580924 Move SignalType into processinterface.h
Rename it into ProcessSignalType. It's going to be
used in new interface.

Change-Id: Ifbab8bbb601f14ecbf65d940e524c558d5f1d7a1
Reviewed-by: hjk <hjk@qt.io>
2022-06-08 12:03:29 +00:00
Jarek Kobus
cf47ad361d QtcProcess: Get rid of NoSignal synthetic value
Refactor flushing methods.

Change-Id: I1b98de58e8ddacfa5ff7e1627c5011c0bd207a8b
Reviewed-by: hjk <hjk@qt.io>
2022-06-08 12:03:22 +00:00
Artem Sokolovskii
674f62d481 ProjectExplorer: Add possibility to keep link visible
Added possibility to keep link to global settings visible when
checkbox is invisible.

Change-Id: I724f1c1997b640b2277c4004acd24d5f6cca9faa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-08 11:43:20 +00:00
Jarek Kobus
493573b879 QtcProcess: Make reaper timeout customizable
Add a setter and getter for reaper timeout. This makes it
possible to customize the timeout for the reaper after which it
should call kill() when previous terminate() was unsuccessful.

This setting is also used for QtcProcess::stop().

Change-Id: I653a3ad107ae4173bb8254c85cfc07886bf6a9c6
Reviewed-by: hjk <hjk@qt.io>
2022-06-08 11:21:42 +00:00
hjk
b6db9d8152 Gitlab: Some layout code cosmetics
Take advantage of the aspects' setLabelText.

Change-Id: I00060a02393fb90557f0f4dd01411fd3928c4c19
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-08 10:43:15 +00:00
hjk
6aa94e1e17 Qmake: Show more error if qmake runs but without output
At the same time, use the more descriptive FilePath::displayName()
instead toUserOutput().

Change-Id: I9bcca84b1f0be025c511b6fbf58c7308c9ffd60f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-08 10:42:39 +00:00
hjk
08952180a1 Boot2Qt: Fix creation of full command line
Task-number: QTCREATORBUG-27673
Change-Id: Idd1bf676ef7ec0821da938274b03d7529100b2e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-06-08 10:42:15 +00:00
Evgeny Shtanov
3b373eecd4 reformatCharacter: int to QChar conversion segfault
Debugger, watchhandler: incorrect type conversion:
Converting from `int` to `unsigned int` can lead to a situation where
the result is too large to be represented as a `QChar`.

Task-number: QTCREATORBUG-27107
Change-Id: I7873635f7a1ef29f62339ffe23b4dd84cb089e2b
Reviewed-by: hjk <hjk@qt.io>
2022-06-08 09:56:12 +00:00
Christian Kandeler
49bb40f19e ClangCodeModel: Move "follow symbol" into its own class
Change-Id: Ic64c7275debaa59c524f349fd38460f47f826ecd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
2022-06-08 09:48:17 +00:00
Jarek Kobus
457fe4eb87 DiffEditor: Drop Utils:: prefix when using namespace Utils
Change-Id: I640447bcd90bba4281b2b945f53c54040060d3bc
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-06-08 09:16:42 +00:00
Brook Cronin
04b3962daf QmlDesigner: add new timeline animation icon
Change-Id: I69efb2ed5a56fbf1848d00963ae70002f11b2e75
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-08 07:52:52 +00:00
Eike Ziller
9ab0510eaf Aspects: Update of combo box when changing TriState value
Call SelectionAspect::setValue instead of skipping it and calling
BaseAspect::setValue directly. That takes care of updating the combo box
state.

Amends c8829ff5b3

Change-Id: I55e90459c2b54da09883f746b61b19d46acfdf92
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>
Reviewed-by: hjk <hjk@qt.io>
2022-06-08 07:52:22 +00:00
Tapani Mattila
0b404c9c7a QmlProjectManager: Load QDS landing page content when it is needed
Task-number: QTCREATORBUG-27583
Change-Id: Ib329816f7282b0c6f88d78d62a0c9f34c961e509
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-08 07:43:52 +00:00
Eike Ziller
1445e4180f TextEditor: Fix action text
It adds the next match to the selection (as a multi-cursor selection),
not the selection to the next match.

Change-Id: I7520cb3b765562fac2dd45fce5d3b0e4ee7c22c7
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-06-08 07:41:35 +00:00
Xavier BESSON
bcf43e56b4 Label error for line length setting in QML editor
Change-Id: I637ef8b5aebfb05ebe9c132b3c6a60f170337c57
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-08 07:31:13 +00:00
Jarek Kobus
f051ed3076 QtcProcess: Add a test for various quit methods
The quitBlockingProcess() test examines different types
of process quitting and illustrates differences in
behavior.

Change-Id: I9209f00576e03eef66fbdf5665351138ed437ac9
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-06-08 06:57:49 +00:00
David Schulz
b4b779d641 TextEditor: fix indent length calculation for rewrapParagraph
Fixes: QTCREATORBUG-27602
Change-Id: I43650be75807c9954eeabca4dbe6749de493f523
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-08 05:56:36 +00:00
David Schulz
33167f7f50 TextEditor: use tabsettings to get indent column
Change-Id: I23c84194633ba5cb485fefb6195fcbb3ad37d95a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-08 05:56:30 +00:00
Eike Ziller
f26da75f41 Merge remote-tracking branch 'origin/8.0'
Change-Id: I360d367eff4c3d91bbcb60d293c3135f810e84d3
2022-06-07 16:36:30 +02:00
Miikka Heikkinen
7269aafbd8 QmlDesigner: Ensure material library is created when needed
Added material library accessor to AbstractView, which creates the
material library and moves existing materials under it in case it
doesn't yet exist. Also added material assignment function to
AbstractView. The reason these were added to AbstractView instead of
being handled e.g. via custom notification in material editor is that
they need to be called from multiple different views in the same
transaction that triggers the need of material library.

Fixes: QDS-7081
Change-Id: If2bb884f87d04c9f3599c2342df66ef51ec238ee
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-07 14:14:56 +00:00
Eike Ziller
4ded73583d DeviceShell: Fix compile issues
- fix warning deviceshell.cpp:222:59: warning: suggest braces around
  initialization of subobject
- add missing dependency to app_version to tests

Change-Id: I6d61f26cbc6f51b28175257ab7d0f4d2b491fecb
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-06-07 13:36:25 +00:00
Jarek Kobus
ec63e694d8 DeviceShell: Don't store a shell script on remote side
Execute a script directly on remote side instead.
Storing it always into /tmp/shell.sh may potentially break
when 2 or more shells are being started for one device at
the same time.

Change-Id: I2b8c94ef531fa4916383355a312421a3a18bfcad
Reviewed-by: hjk <hjk@qt.io>
2022-06-07 13:21:06 +00:00
Marcus Tillmanns
b82f321c9a texteditor: Add Select Next Match respect find settings
To increase the usefullness of the function, this change
adds the current search settings to the find() call.

This way the "case sensitive" and "whole words only" is taken
into account when searching for the next occurrence of the
selected text.

Change-Id: Ia4b28e84c39b9298d2dcbfa381ccf19d8137bfc6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-07 12:25:56 +00:00
Miikka Heikkinen
d2cc440c68 QmlDesigner: Add checkerboard background in navigator preview tooltip
Checkerboard helps visualizing alpha channel in previewed images.

Fixes: QDS-7060
Change-Id: Idb0139f8d8fcbf595bbfba3b333cd3d49f18d8af
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-06-07 12:06:10 +00:00
hjk
4c5f9dcbd4 RemoteLinux: Use more FilePaths in install step
Patch is self-contained, no functional change intended.

The transition is, however, not complete yet as the would break
the consumer side currently.

Change-Id: I04b7d919dffbfb9237863e6166247305c20f1091
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2022-06-07 11:47:30 +00:00