Commit Graph

69741 Commits

Author SHA1 Message Date
Aleksei German
c9e18ce538 QmlDesigner: Fix for Annotation title removal
Task-number: QDS-4885
Change-Id: Ia938aaa7c2bdc33c0beeef83613520ca1b81272d
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2021-08-18 08:27:14 +00:00
Leena Miettinen
d9c1b21fd4 Doc: Update properties related to positioning components
Add a table that summarizes the buttons in the Alignment section
in Properties.

Task-number: QDS-4561
Change-Id: Ieeae56206cc5126eb519297fbe4d0e9043775a7d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-08-18 08:08:07 +00:00
Eike Ziller
2d8d6e31b6 COIN: Use 6.2 branch for VMs
Change-Id: Id3e06e0cd36e79760e5d7ba5a83de07c26bde836
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-18 07:56:04 +00:00
Leena Miettinen
773d0fdcc5 Doc: Add Mouse Area properties and update Flickable properties
Fixed the navigation link targets to match the TOC.

Task-number: QDS-4561
Change-Id: Ieca619f7f5e8bd3110f774cc75dbe224216b96e1
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2021-08-17 16:04:40 +00:00
Leena Miettinen
2aed13529b Doc: Update properties for Grid View, List View, and Path View
Task-number: QDS-4561
Change-Id: I80b33d38d9aa234aa05f172ee815773927802e31
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2021-08-17 16:04:26 +00:00
Leena Miettinen
3637830793 Doc: Update Qt Quick Controls properties
According to the changes in the Properties view.

Task-number: QDS-4561
Change-Id: I1b75b5388350fc0dadb9f7b7c1532bdc6c97e32b
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2021-08-17 16:04:14 +00:00
Eike Ziller
e54cbc69d8 RemoteLinux: Fix updating of command line for temporary local install
E.g. in case of CMake projects the command contains the build directory,
so it needs to update whenever the build directory (or build configuration)
changes.

Fixes: QTCREATORBUG-26103
Change-Id: I02ea3bd47f4a502adc485dfffbed6a14ebefb0bb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-08-17 14:04:08 +00:00
Thomas Hartmann
cd40514010 StudioWelcome: Use Titillium on Windows again
QTBUG-94529 seems to be fixed in Qt 6.2 Beta 2.

Task-number: QDS-4539
Change-Id: I8b4981f9b023060a6ad2ed8a623f4d0ae3c5d5f7
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-17 12:35:43 +00:00
Christian Kandeler
71f2e7566d QbsProjectManager: Ensure profile for kit without Qt and toolchain
Change-Id: I52f2bad18570587fe1bca8ad20692993e04cef76
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-17 10:35:39 +00:00
Christian Stenger
b489afd91b AutoTest: Fix gathering failed Qt based tests
Omit special and test data functions while collecting
as these cannot be addressed at all.

Change-Id: I3d79192cd07b4e7e2e76f04dfad36ef033593e71
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-08-17 10:17:30 +00:00
Henning Gruendl
3c0b75f2ef QmlDesigner: Fix injection of parameters warning
* Fix a warning about injection of parameters into signal handlers being
  deprecated
* Fix comparison operator

Change-Id: I33d0fe21f39feea69bcca82a57036594d28b039a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-08-17 10:00:10 +00:00
Christian Kandeler
274b8011ab Designer: Consider alternative class name
... in "Go to Slot".
The class can be referred to as Ui::<class> or UI_<class>.

Fixes: QTCREATORBUG-26013
Change-Id: Ib539855b0360ce5fe06fb3cac664af3967695206
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-17 09:30:57 +00:00
Ulf Hermann
fdaa9b1c10 QmlJS: Destroy local snapshot before modifying its original
If we keep the copy of the snapshot around while it's being modified, we
trigger the copy-on-write mechanism. That is expensive, and destroying
the snapshot afterwards is also expensive.

Task-number: QTCREATORBUG-25899
Change-Id: I9b7e26baf63a4b47c85457e5657fee971a6ce132
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-08-17 08:55:31 +00:00
Orgad Shaneh
a6917a5484 QtcProcess: Do not discard stdout and stderr buffers when callback is set
All the uses of setStd{Out,Err}Callback in the codebase call proc.stdOut/
stdErr after the execution.

This triggered a soft assertion that was apparently not noticed so far.

It broke for example prompt for conflict resolution on Git pull/rebase.

Change-Id: Ib4b8301f1f50b2b66f02fc4dc6c14d93f895ea33
Reviewed-by: hjk <hjk@qt.io>
2021-08-17 07:58:48 +00:00
Eike Ziller
e47ca44fa2 Update Qbs to HEAD of 1.20
Fixes issues with CMake 3.10 and avoids CMake output noise when using
Qbs' copy of QtScript.

Change-Id: I7e50b91302b925e9d4a0b8f098760b90351145fc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-08-17 07:14:39 +00:00
hjk
733972193d QtSupport: Fix Qt version detection
Amends 84befc2 which was too strict.

Fixes: QTCREATORBUG-26123
Change-Id: I3767ba0fb4723c77cfb0e8b1932ff6adfc8e9ac2
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-08-16 13:24:51 +00:00
Thomas Hartmann
2ab7176e79 QmlDesigner: Clean up singleton generation
The singleton is of type QmlDesigner::Theme
and there is no reason for the QObject cast.

Change-Id: I352f3e455de8233c914f37ba93e2313a3a6357fe
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-16 08:28:34 +00:00
Aleksei German
a107a277b9 QmlDesigner: Fix for Annotation Table View
Task-number: QDS-4636
Change-Id: I7eb31f58525264f763f06bed72636d1e9d905dc7
Reviewed-by: Aleksei German <aleksei.german@qt.io>
2021-08-16 08:20:28 +00:00
Miikka Heikkinen
aef13a5dcd QmlDesigner: Disable 3D particle systems from running on puppets
Running 3D particle systems based on their application set properties
is usually not desirable, so until we have proper solution for
controlling particle systems from UI, we disable them entirely.

Fixes: QDS-4773
Fixes: QDS-4801
Change-Id: I45682d8ac5a161a92be98fe9b0304ffb948f104f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-16 07:56:49 +00:00
David Schulz
67a86b72b7 LanguageClient: do not send empty responses
Even if we do not have to provide any data just send a null as the
result so the server nows that the request did not fail.

Fixes: QTCREATORBUG-26116
Change-Id: I9b965389bb197cdd81d0d3ffbac05f289cabda40
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-16 07:48:34 +00:00
Alessandro Portale
99700bb009 Android: Enforce portable/clean Android SDK path
When reading a path from file chooser, settings or environment variable,
make sure it is portable and "clean".

Avoids extra compiler registrations, invalid Kits and similar issues.

Fixes: QTCREATORBUG-26092
Change-Id: I2a11563f40973d5f595bf00e37ff045a503aa9f7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-16 07:31:12 +00:00
Henning Gruendl
14d1726c95 QmlDesigner: Fix crash with ColorEditorSingleton
Fix a crash that was caused by ColorPaletteSingleton being shared among
multiple QQnlEngines. Each engine requires a unique instance of
ColorEditorSingleton.

* Rewrite ColorEditorSingleton to not be a singleton anymore
* Rename ColorEditorSingleton to ColorEditorBackend
* Add meaningful warnings

Task-number: QDS-4728
Change-Id: I1ed3315add33754b41870ad6f43c1365a899102b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-16 07:23:20 +00:00
David Schulz
341234f3cf LanguageClient: always connect client to manager
The client will be either freshly created or if it was restarted
disconnected in LanguageClientManager::clientFinished

Change-Id: I647d0aaa918419c328013b2dc978d345f7e09c32
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-16 06:53:15 +00:00
Aleksei German
20eaf0bbeb QmlDesigner: Fix for Annotation images crash
- removed direct usage of SessionManager
 - replaced it with DesignDocument usage
 - deactivated add image button for files without projects
 - add hasProject method to DesignDocument

Task-number: QDS-4810
Change-Id: I77c74f3c6e9b5b9dcbda68f7937cfeda531d0309
Reviewed-by: Tapani Mattila <tapani.mattila@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-13 15:28:29 +00:00
hjk
1afea827bb Don't try to add absolute paths with FilePath::pathAppended()
Change-Id: Ib4cc5cacb33679e4ed8d7aec24b6392c2e000b60
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-13 14:29:09 +00:00
Christian Kandeler
c69ef181ab OutputWindow: Update auto-scroll flag when "Find" changes position
In this case, the text edit's scroll bar does not emit a signal, nor is
scrollContentsBy() called (Qt bug?).
Therefore, we now check the scroll bar position also on a selection
change.
Note that this will still misbehave for the edge case where you search
for something, then scroll back to the bottom, then search for the same
string again and find the same result, because in that case the selection
does not change. We live with that.

Fixes: QTCREATORBUG-26100
Change-Id: Ib5555d9119117dd95c68175c4094bb0fd904f6e5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-08-13 12:22:19 +00:00
Janne Koskinen
b8b6af0dbb Add 3D editor Gizmo for Quick3DParticles
Adds an icon for Particle System Component making the component
visible in the editor allowing picking.

Task-number: QDS-4784
Change-Id: Ie6cffa9cfe3bb6a693372d7a7b4341e17f89911f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-13 11:23:19 +00:00
Robert Löhning
00a2dd0747 Squish: Explicitly convert analyzer data to str
With Creator built on Qt 6.2, Squish considers the
data different although the contents look the same.

Change-Id: I281b7425d5b3f9a977456253e0299f452d75c1e2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-13 09:23:33 +00:00
Robert Löhning
765e6d2856 Squish: Remove redundant search criteria for named object
Change-Id: I8d6432f479381c7a517b8aeaeb29f76da03f4ae2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-13 09:23:13 +00:00
Robert Löhning
aec25d293b Squish: Use regex instead of wildcard to find objects
Squish 6.7.1 for Qt 6.1.x can't find the objects when using wildcards. The
same version of Squish for Qt 5.15.x works fine.

Change-Id: Ia378934af51cab2894a9df01e2391dbdb9cf32f9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-13 09:22:57 +00:00
Eike Ziller
1dd0511b49 Bump version to 5.0.0
Change-Id: I1203dd71cc2f1e6d1f435dbfdc07376130fbb61f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-13 07:25:12 +00:00
Thomas Hartmann
48e0ae7bd6 QmlDesigner: Remove SplitView from library
This was done for controls 1.
SplitView in controls 2 requires proper test and support.

Change-Id: I749ee072abb50256ad87002605e3064e0a066f29
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2021-08-13 06:41:30 +00:00
Alp Öz
eb54c77ebb Locator: Space character in file name index
For the tools es and locate, interpret space as AND operator.

Change-Id: I62692ee0d3afed096173bbb789ea1c6b93ce543c
Fixes: QTCREATORBUG-26064
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-13 05:36:54 +00:00
Henning Gruendl
d3b6777d12 QmlDesigner: Fix button tooltip blocking event
Fix HelperWidgets AbstractButton nested TooplTipArea blocking hover
events from the actual control.

Task-number: QDS-4828
Change-Id: Ibd390c98805a49f903663b6c38091f727c2b7ec9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-12 14:07:31 +00:00
Christian Stenger
0408b4a757 Squish: Improve Python2/Python3 compatibility
Change-Id: I49dc9ee2f4ef52900b403ed94f0c6cd5925239b6
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-08-12 11:17:44 +00:00
Robert Löhning
e9f53752ee Squish: Update tst_codepasting
Change-Id: I7929a97dea0a362f07eff46a37d84b65fa546bbc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
qds/v2.2-beta1
2021-08-12 10:19:27 +00:00
Eike Ziller
9521d22758 Update qlitehtml to latest master
Fixes installation of .lib file on Windows

Fixes: QTCREATORBUG-26039
Change-Id: I593361d2852f589b4f31832d089ebc6af89e0a00
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2021-08-12 08:41:44 +00:00
Eike Ziller
4e3d1f6f0e COIN: Build with Qt 6.2 beta2
It is a stable base to run the precheck on.

Change-Id: Ie5e0699b9067dccba85a3ad4e1b9102799ca5d0f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-12 06:45:03 +00:00
David Schulz
1b4bc664eb git: ignore clangd cache directory
Change-Id: I072a7f29df860d3f47369ed6f0311271b750166e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-08-12 05:35:47 +00:00
Thomas Hartmann
640e7107c5 QmlDesigner: Fix tests after parser update
Since the last parser update the source location is valid
even if there is no semicolon. The length is 0 in this case, though.

Change-Id: Ie2ff425b54ef39d9db66119236d5e8f56677b748
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2021-08-11 18:40:41 +00:00
Ivan Komissarov
d485aa4d51 Update Qbs submodule to the top of 1.20 branch
Change-Id: Ic48052398332ff1d48e3e7b586e8bb5b9c82c521
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-08-11 16:15:46 +00:00
hjk
4000819262 Utils: Weaken QTC_CHECK in QtcProcess::stdErr()
The previous tighter check is actually good theoretically, but currently
ShellCommand::runFullySynchronous triggers it and disentangling there
is not trivial. So weaken it a bit for now to not annoy users.

Change-Id: Ifc6b5713b398db0af0f604834c37ff361c2a1ed3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-08-11 15:08:13 +00:00
David Schulz
e88b4ebce8 clangd: open documents just once
Opening a document in the language client while the server is still
initializing will postpone the opening after the server is fully
initialized. So if a document was scheduled for opening by
ClangModelManagerSupport::onEditorOpened while clangd is still
initializing, skip the superfluous opening in the ClangdClient
initialize callback. Clangd seems to have issues if files are opened
twice, resulting in strange diagnostics after editing the file. This is
reproducible for me when starting Qt Creator with a session that
contains open files.

Change-Id: I200d5c8afb685403f0435e0553f5a475f75e8ea2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-08-11 14:55:44 +00:00
Leena Miettinen
7409168929 Doc: Describe checking out an appropriate qtquicktimeline branch or tag
The instructions are for using qmake, but qmake configuration files were
removed from the 6.1 branch.

Fixes: QDS-4722
Change-Id: I525c5042396576029d575c767dcaa37333b809f5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-11 14:30:46 +00:00
David Schulz
c9b6b5d4fd QtSupport: use preferred toolchain when fixing kits
currently we use the least preferred toolchain when looking
through all possible toolchains

Change-Id: I520a21bf380c4d1550a62dd9174fd2b67e12bc8e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-08-11 13:53:39 +00:00
Christian Kandeler
04c42db0ad ProjectExplorer: Do not make toolchains sticky in SDK kits
For the case that the installer specified the toolchain
ABI (rather than a concrete toolchain), we now let the user choose.
Note that we do not enforce the original ABI. In practice, this is
anyway redundant with the Qt version, which is still fixed.

Fixes: QTCREATORBUG-25839
Change-Id: Ifd800a736bde59091ce7d07e7a3db1776ad35879
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-08-11 13:31:43 +00:00
Leena Miettinen
8139031f2d Doc: Fix check box name that changed from Mirrored to Mirror
Task-number: QDS-4561
Change-Id: I3052f91dd79738c97a14873a50d617b27c6f62f5
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-08-11 12:08:42 +00:00
Henning Gruendl
714f67bfc8 QmlDesigner: Temporarily remove linking/mirroring
Remove the linking indicator and the mirroring buttons until the
functionality will be implemented.

Change-Id: I7d76209fc8c184001690b001cbb0e9a8255bde9f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-11 11:21:46 +00:00
Eike Ziller
ced3a32f99 Welcome: Point Get Started button to Qt Creator's Geting Started page
Fixes: QTCREATORBUG-26054
Change-Id: I4fd9cc5d18bddc812a97cdbc4b757ba617fe7098
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-08-11 11:17:10 +00:00
Leena Miettinen
b852c8f0cd Doc: Update properties of Rectangle and Studio Components
- Check section captions and field labels
- Update screenshots

Task-number: QDS-4561
Change-Id: I4b2bbd8fc14ad659eb075e01b6e2d53e48b7e5fa
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
2021-08-11 11:12:53 +00:00