Commit Graph

68568 Commits

Author SHA1 Message Date
Christian Stenger
9a5d152dc8 Utils: Fix compile for gcc 7
Using ctor delegation seems to confuse gcc if an initializer
list is involved and ends up in
 'error: constructor delegates to itself'

Change-Id: If72683c8bde9a0880c3b4c727c3dc116f2dbc60b
Reviewed-by: hjk <hjk@qt.io>
2021-03-17 08:19:53 +00:00
hjk
bc3f8e9810 Utils: Make AspectContainer::setAutoApply sticky
So it applies to all subsequently registered subaspects.

Change-Id: I9cc215b6ed9637eefc3b1721db778d4097809faa
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-17 08:12:46 +00:00
Henning Gruendl
f0983a08c9 QmlDesigner: Replace CSS color role
* Replace color role in CSS
* Add hover and focus state in CSS
* Fix hex color value in creator themes

Change-Id: I59626f369e2c02089f22bd51557d8226e2dc3631
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-16 17:18:31 +00:00
Knud Dollereder
d41d59774a Apply new theming colors to the curveeditor
Change-Id: Ia919bfda4db1205b9c30ece247d2e3d49a6362ed
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-16 16:16:36 +00:00
Eike Ziller
2bcc33e010 Bump version to 4.15 beta2
Change-Id: I29436ee542d1f35e8117d670ea5cadd172432b94
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-16 14:40:20 +00:00
Thomas Hartmann
5b942b9e88 QmlDesigner: Fix compilation for Qt 6
For Qt versions below 5.15 and Qt 6 we can continue to use
the internal version.

Change-Id: Ia314fe9db323b0d5ea6acbb70bf1cb1098b4ae93
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-16 14:35:48 +00:00
Eike Ziller
65d2f87f6c Editors: Fix another soft assert about current view
Task-number: QTCREATORBUG-24869
Change-Id: I575153a909f398ade4dce4edbb4927ea0d35c20f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-16 13:55:30 +00:00
Leena Miettinen
012edb2d77 Doc: Update MCU info
- Use the term "component" instead of QML type
- Update screenshot with the new Library layout
- Link to the new topics for Library and Properties views

Task-number: QDS-3778
Change-Id: I123e3c2050075b17a8944e0d6dc4e6aadc1905a8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-16 11:48:52 +00:00
hjk
a388769c00 CMake: Use LayoutBuilder in build configuration widget
Drop intermediate widget layers, also fix the QML debugging and profiling
aspect misalignment.

Change-Id: I5ee5041ab7db2c05efdd66598c39b589e3d4f56a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-16 11:37:56 +00:00
hjk
035a6ff031 Utils: Avoid intermediate widgets when using LayoutBuilder
In most cases, the layout constructed in the builder was set
on a widget which in turn was put into a vbox in the actual
widget. This is not necessary, but needs some re-ordering.

Also make sure that using not-yet-parented widgets during
layout construction does not cause visible artifacts.

Change-Id: I75727a571da093d3131ea6fba467c2c646cdb6f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-16 11:37:44 +00:00
David Schulz
c218f77f7e LanguageClient: compress documentHighlight requests
Change-Id: I98707a61a228c66966c72f6b4da2470b6f53820e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-16 11:07:09 +00:00
Tuomo Pelkonen
85533cce0f QmlDesigner: Use correct font in Text-edit based in-place editor
Task-number: QDS-2306
Change-Id: I47d886f013692be717b4dffd29d66c711b0760cf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-16 10:16:23 +00:00
Eike Ziller
4151f091e3 Merge remote-tracking branch 'origin/4.15'
Change-Id: If0dbebdf37b0ffea2528bf6ce6d34d88554f8dfb
2021-03-16 10:55:54 +01:00
Mahmoud Badri
f820164b1a QmlDesigner: Use a different color for unimported items section
Fixes: QDS-3873
Change-Id: Ic713353d8fe5c1bfb4ff11f1224294ecde182fa7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-16 09:16:21 +00:00
Thomas Hartmann
23477f633b QmlDesigner: Use theme colors for easing curve editor
Change-Id: I38969d88caf6ad536c19fbf0998e19230559ceb1
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-16 09:11:40 +00:00
Henning Gruendl
db6ad528bb QmlDesigner: Implement new control design
* Update creator theme files and related enum
* Remove unused ActionIndicator functionality
* Update all controls (Colors, Positions, Sizes)
* Add global hover state and cleanup all other states
* Add global hover functionality to ButtonRow
* Add missing states
* Add new MenuItemWithIcon
* Add checkers.png for StateDelegate preview background
* Update copyright headers
* Replace AnchorButtons spacing
* Make ADS title bar buttons and tab bar buttons themeable
* Fix replace CSS colors to allow specifing alpha
* Fix replace CSS overwritting consecutive variables
* Make navigator icons and other elements themeable
* Make connection view themeable
* Make item library themeable
* Fix item library import path
* Update all HelperWidgets
* Fix GradientDialogPopup

Task-number: QDS-3768
Change-Id: I28a5fed178c95d098db052b8c2eabaa083d37b81
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-16 09:11:38 +00:00
Eike Ziller
05701491a1 FakeVim: Fix compilation with Qt 6
By using recursive QHash instead of recursive QMap, which has issues
compiling under some circumstances with MSVC.

Change-Id: I545a5eb9002f247a5015e7ea5e59cf74895b1e21
Reviewed-by: hjk <hjk@qt.io>
2021-03-16 08:50:40 +00:00
Vikas Pachdha
35d7bc49f0 iOS: Add relay server to route gdb data via service connection
Communication using sockets can no longer be done for gdb server,
though a TCP socket opened using USB MUX still operates normally.
I.e the QML debug server communication remains as is but GDB
server data has to be routed via the secure service connection

Task-number: QTCREATORBUG-24672
Change-Id: I64631d66dc845dd2d7a20c771534ae17e183a9b8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-16 08:44:45 +00:00
Vikas Pachdha
b152a7287c iOS: Create single instance of mobile device library wrapper
Task-number: QTCREATORBUG-24672
Change-Id: I30f0022735409dbbd03b6bdadf7138ff6294b131
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-16 08:44:39 +00:00
Vikas Pachdha
4d1e3276fc iOS: Fix iOS 14 application launch
Use service connection to receive and send gdb commands. Communication
via socket can no longer be done. Apple introduced this change to plug
the security issue when debug session was done over wifi

Task-number: QTCREATORBUG-24672
Change-Id: I7ad08242c3b13a2707b6320ee5bc1e18b5f1173d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-16 08:44:33 +00:00
Vikas Pachdha
8400a3d6e3 iOS: Refactor the ios tool
Move classes into logical compilation units

Task-number: QTCREATORBUG-24672
Change-Id: Ia7c0866fa16dca0df05fc70418f8142ff74a5d59
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-16 08:44:23 +00:00
hjk
2756794b4f Utils: Drop deprecated Utils::FilePath::{setFilePath,filePath}
Change-Id: I730dfb716f744bbcb62dedf611e93c0d2d358247
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-16 08:12:34 +00:00
hjk
06a754cc74 Debugger: Add more information about the debugee when debugging
Fixes: QTCREATORBUG-25159
Change-Id: Ic462c8bb4d9f4f7163dbb9fcc13adce4c7172564
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2021-03-16 08:12:26 +00:00
hjk
61b278fe6e VCS: Allow VcsBaseEditorConfig to operate on aspects
Change-Id: Id7b5b1a1020ea002e631e401c49b8eda6dfb8944
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-16 07:18:50 +00:00
hjk
687d6a76ec Utils: Add a AspectContainer::isDirty convenience function
Change-Id: I8503c715742bce8f59da9b0e6c7e7a85c5fc397b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-16 07:18:38 +00:00
Christian Stenger
da53e3f994 Squish: Allow automatically created kits
Linking to Qt makes the respective configured kits become
auto detected and these have a fixed Qt.
The Qt version combo box for these kits is disabled on the
Kits page, so be more relaxed when checking kits page.

Change-Id: Ieb7e22b47bd5e5c5603e85dc0ddf2421427e85d6
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-03-16 07:11:26 +00:00
Christian Stenger
412b661672 Squish: Correct hitting "Do Not Show Again"
Original implementation just made it work for the common use case.
If the order or the selected buttons differed from the common case
this failed.
Beside this it is later on more easily to extend.

Change-Id: I581b0af2579fa728a81b9946028ade5559f17fd8
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-03-16 07:10:53 +00:00
hjk
54e195642c LanguageClient: Compile fix
Amends a7fc1631a7.

Change-Id: I868c1ca1bfb5fc0d629e7621597ab71de7aca367
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-16 05:31:08 +00:00
David Schulz
a7fc1631a7 LanguageServerProtocol: add progress support
Change-Id: I8d3ccf0626ccde39516bbd024ed6e2da0380e4de
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-16 04:54:44 +00:00
hjk
ef25cfac59 Utils: Do not add extra space for user display of command lines
... that do not have parameters.

Change-Id: I2ea20267bc18826e4017a356f6bc13f4b0172f3c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-16 03:36:04 +00:00
Ivan Komissarov
1f3cd3c70f Update Qbs submodule to the top of 1.18 branch
Change-Id: Ifa6522e01b32c48e830c395347e891a89c9ad35a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-15 17:31:56 +00:00
Thomas Hartmann
92da864a86 QmlDesigner: Replace deprecated color roles in timeline and transition editor
The color roles qmlDesignerBackgroundColorDarkAlternate and
qmlDesignerBackgroundColorDarker are deprecated.

Change-Id: I0c7cabe0eacbcab57a037caa83c338791930420c
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-15 16:55:36 +00:00
Thomas Hartmann
38756f1c7a QmlDesigner: Use Theme::DScontrolBackground instead of BackgroundColorDarkAlternate
The color role qmlDesignerBackgroundColorDarkAlternate is deprecated.

Change-Id: Ic6ab5883c980b83c3d47830ab51b805936007547
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-15 16:55:25 +00:00
Jarek Kobus
3ab93592c3 CppLocatorData: Don't use recursive mutex
Don't use recursive mutex in CppLocatorData class,
as this is more expensive to construct than simple
QMutex. Refactor the code so that every call to
flushPendingDocument() is done with already locked
m_pendingDocumentsMutex. This eliminates the need
for recursive mutex.

Remove unused allIndexItems() method.

Change-Id: Ic7cb45bc3301d83768e69ee52f84ae159cb731a5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-15 16:37:40 +00:00
Eike Ziller
9d9ac537e8 Don't waste horizontal space in Open Documents view
Make sure that the column that we reserve for the X close button is
really just 16 pixels wide.

Fixes: QTCREATORBUG-23894
Change-Id: Idc2755debfc3a6fb898ea3abd2a882249f7820c1
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-15 13:57:16 +00:00
Christiaan Janssen
2aead8b3e4 McuSupport: detect fallback lib when desktop kit missing
The library filename has changed in recent versions of the
SDK, which was causing false negatives.

Fixes: QTCREATORBUG-25469
Change-Id: Ie98c75a57efc5384262dbfd17f729b34cdd5f577
Reviewed-by: Erik Verbruggen <erik.verbruggen@me.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Dawid Śliwa <dawid.sliwa@qt.io>
2021-03-15 12:10:45 +00:00
Robert Löhning
2ec094b419 Squish: Prepare for clang > 9
Change-Id: I4cf6e8be63568d56388b0cf87ae692735bf4c113
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-15 09:53:55 +00:00
Tom Praschan
5fcd52fe83 ClangCodeModel/TextEditor: Add support for highlighting parameters
This is already built into clang, so we just need to expose it to the
highlighter and the UI.

Fixes: QTCREATORBUG-24880
Change-Id: I6d0595af2589a9b69eb954aafad46457ab2c5752
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-15 09:48:24 +00:00
Alexandru Croitor
af184fdd4c CMake Wizards: Add Qt 6 specific static qml plugin importing
For Qml / Qt Quick projects to work with static Qt builds, the
application targets need to link to the static Qml plugins, which
is done by calling qt_import_qml_plugins.

Starting with Qt 6.1 and CMake 3.18+ that will be done automatically in
qt_add_application via qt_finalize_executable, as per
c71c48f5125c116f01f615f51f10e4f2877b2b1d

But for Qt 6.0 and lower CMake versions, we need to call
qt_import_qml_plugins manually, thus we include it in the
Qt Quick wizard template so that it works with all Qt 6 versions
and lower CMake versions.

Amends b72c1d11e6.

Task-number: QTCREATORBUG-23574
Change-Id: Id8db3352ecbb8441eda9f5c9638c7ea6ac1fee96
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
v4.15.0-beta1
2021-03-15 08:45:12 +00:00
Eike Ziller
280545fdf8 Editors: Fix soft assert about empty currentView
We need to always either have a current view or a current editor.
Make sure we set the current view if we end up without a current
editor when closing files.

Amends ee1e6ca508

Fixes: QTCREATORBUG-24869
Change-Id: I9e1982697700079e037695e100ef71eadaf7849f
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-15 07:57:08 +00:00
Christiaan Janssen
edba0ca838 McuSupport: track if kit dependencies go missing
Task-number: QTCREATORBUG-25262
Change-Id: Icf95a418216ae94fcfc76784a10eb23e403f3d52
Reviewed-by: Erik Verbruggen <erik.verbruggen@me.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-15 07:25:17 +00:00
Mahmoud Badri
5fbef6c060 QmlDesigner: Add all Quick3DAssets under 1 import section
Fixes: QDS-3866
Change-Id: I3aad4aee0d6c388446b459e558d87f68b204de59
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-12 17:00:22 +00:00
Thomas Hartmann
ac24d4357c QmlDesigner: Fix puppet crash
Limit the depth of recursion. There can be cycles.

Task-number: QDS-3877
Change-Id: I10a1c7033b956244308e87aae6897f0040e0bc22
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-03-12 15:51:29 +00:00
Miikka Heikkinen
71c5f9e52b EditorManager: Do not switch mode in response to editor closing
Switching to design mode when in process of closing editor can result
in state where there is no active text editor for a document, which
is required to properly initialize design mode. This happens when
the next editor to be activated targets the same document as the
closed editor, i.e. when the last open document is used in split view.

To prevent design mode initialization crash, we block
changing to design mode in response to editor closing, if the
new editor targets the same document as the closed editor.

Fixes: QDS-3763
Change-Id: I2bd325b805d3e526778f8cdd8e583e87b8c93a24
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-12 14:38:33 +00:00
Eike Ziller
9c3e1cacf1 Merge remote-tracking branch 'origin/4.15'
Change-Id: I057a04e81301f6f2ae43dbd81734d3989fca7132
2021-03-12 15:26:01 +01:00
Johanna Vanhatapio
0d0eb5be24 Doc: Update Info about the 3D Editor view
Fixes: QDS-3844
Change-Id: Ib402fff7525fdf317b925ad55064a97453c254d1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-03-12 14:06:18 +00:00
Leena Miettinen
50b75d29e5 Doc: Fix navigation link target
Change-Id: Ia7dd91c72b81483f92ffdfacfa597847fc6b86f6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-03-12 13:48:23 +00:00
hjk
d5dec08893 Utils: Pass settings key to BaseAspect::saveToMap
Makes the code on the user side somewhat more symmetric and is a
bit more flexible, even if that's not used right now.

Change-Id: I29a5182463ead0e4a39fcb51ecf4fdd5adf2a203
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-12 11:30:22 +00:00
hjk
4cebde86da Utils: Remove two unused AspectContainer functions
Change-Id: I786c80a84ee40cb6ea6711c13c208bd00ee6ad82
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-12 09:14:30 +00:00
hjk
da01f4544f Valgrind: Create a SuppressionsAspect
This is a fairly complex use case, as the corresponding widget looks the
same in global settings and Project settings, but behaves differently
(Project only stores a diff, is auto-apply). It also use two(!)
settings keys in the project case.

So while it works, it takes manual help for the cancel/apply and
toMap/fromMap. Looks like there is still some basic infrastructure
missing.

Change-Id: I25ab7b41616ee09ff9133e93b84f34947fc32988
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-12 09:14:06 +00:00