Commit Graph

47434 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Marco Bubke
da7b83b238 QmlDesigner: Bump multi language database version
Change-Id: Icd9b379c4dfbc09a8f949c86e0354d28f6184bc7
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-03-11 16:47:18 +00:00
Eike Ziller
bce64778c5 Merge remote-tracking branch 'origin/4.15'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qtcreator_ide_branding.pri

Change-Id: I009308451e1c6276692412f498125d79a8f12a07
2021-03-11 14:10:14 +01:00
hjk
3560a86c2e Debugger: Delay evaluation of stub runnable environment
There can be modifications in the environment between the decision
to use a terminal and its start. We want them taken into account.

Change-Id: I5622614c5fac3bdd8167c29e7b618b5e42a28287
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-11 12:26:54 +00:00
Christian Stenger
aa96b07853 ClangFormat: Fix compile
Amends 14eb5b382c.

Change-Id: I9bbd34d1d90d2cf27edd74037be5a3a061691456
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-11 12:11:18 +00:00
Björn Schäpers
14eb5b382c clangformat: Fix build with LLVM 13
Change-Id: I5eaad17a6f240aa1e3f246492b69f093b4f59fee
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-11 07:50:30 +00:00
Eike Ziller
8ac091abf8 CMake: Improve layout of "Apply configuration changes" dialog
Show the CMake parameters that would be passed in a mono space font, one
option per line.

Change-Id: I462792736960b33fea669b5b753c89d21cd087fd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-11 07:47:01 +00:00
Christian Stenger
f0004333b2 PE: Fix expectations of LinkSpecs test on Windows
The output parser detects Windows paths on Unix differently which
makes the format differ from the one that is generated on a
Windows host.
Beside this remove BOM from msvcparser again and do not perform
the format check if there is no expected format specified.
Amends 9e4e9924ad.

Change-Id: Icb0d292a8908cdd2f86b13fde6d2d287f3a96dd6
Reviewed-by: hjk <hjk@qt.io>
2021-03-11 07:09:26 +00:00
Erik Verbruggen
9d90efee8b Add QML import path supplied by the kit
Although QUL has merged the QML import paths and the include paths, the
convention for C/C++ is to have the headers for a project under a
subdirectory of the include path, and do imports relative to the include
path. For example:
  #include <qul/SomeHeader.h>

The QML code model doesn't know about this convention, so for the kit
has to supply an extra QML import path for this case.

Change-Id: I82d4375dd8a1f510180f81b011a715dee8c10d60
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-10 14:33:06 +00:00
Alessandro Portale
50c0f0952d QtSupport: Use native dir delimiter in "Link with Qt..." button tooltip
Change-Id: I5b8def5abb16c965e5bec4ddd7b71e11fe4d9e57
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-10 13:17:02 +00:00
Eike Ziller
a3b537ad39 CMake build: Disable FakeVim and building with PCH with Qt 6
FakeVim does not compile on MSVC because Qt 6 doesn't like
meta types that are recursive maps with keys that have a custom
operator==.
Building with PCH has different issues on macOS and MSVC.

Change-Id: Id1b9580f7347f1c8facade67fd74532a023af41f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2021-03-10 10:40:04 +00:00
Cristian Adam
99dd3a0260 CMakeProjectManager: expand variables for Batch Edit
The Batch Edit dialog is offering the ability to use expanded
variables, but these variables were not expanded upon acceptance.

For the CMake command line they were expanded, but there was a
conflict between what the settings dialog as value had and what
CMake returned via file-api.

Change-Id: Ia4a64e99676c43f7b182e059f9051393aa184c19
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-10 10:30:03 +00:00
Cristian Adam
f7d729f0b5 CMakePM: Treat empty build as empty when importing CMake builds
Qt Creator 4.15 with the CMake multi-config support it parses the
correct CMAKE_BUILD_TYPE file-api json export.

With the empty build Qt Creator was giving it a name: Build, which
was not part of the file-api json export.

Fixes: QTCREATORBUG-25387
Change-Id: Id0b5f1077f6473fa5aef09397a8257b253557597
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-10 10:29:55 +00:00
hjk
9943146cfe Debugger: Introduce an option to force QT_LOGGING_TO_CONSOLE=1
Debug output is ephemeral in nature, and does not belong into system logs.
It happens, however, on Arch. Let people override this.

Fixes: QTCREATORBUG-25421
Change-Id: I5686e256d76e5a127e3269c5f407daf39bad683f
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-10 09:59:02 +00:00
Bernhard Beschow
9e4e9924ad ProjectExplorer: Unit-test LinkSpecs of tasks
Change-Id: Idc86c8fcb9a915490e4a67beb7a057672096861f
Reviewed-by: hjk <hjk@qt.io>
2021-03-09 23:25:29 +00:00
Thomas Hartmann
76be73b157 QmlDesigner: Trim state name
States should never have trailing white spaces.

Change-Id: I67dc08e12fa042a237ede3d2d0247e6ea2b55eff
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-09 15:29:25 +00:00
The Qt Project
01be3816f9 Merge "Merge remote-tracking branch 'origin/4.15'" 2021-03-09 14:33:44 +00:00
Thomas Hartmann
fd763dd60b QmlDesigner: Return action by id
Change-Id: Id1d15acf513786789c4ea4deaa84672f17fd889b
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-09 13:34:19 +00:00
hjk
60c26a4993 Debugger: Use LayoutBuilder for AnalyzerRunConfigWidget
Less noise.

Change-Id: Ieeb853d8bb3661582e7cda275f7c420b8246a046
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-09 13:06:02 +00:00
hjk
641604429a Debugger: Use an aspect for the source path mapping
More in line with the other settings.

Change-Id: I86494f1955120cddda7d2f2eec8ba0fdbfd99585
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-09 12:40:12 +00:00
Miikka Heikkinen
6deac5593c QmlDesigner: Fix infinite loop on item library resize
If item library width goes to somewhere between 50-100 pixels
(around the width of a single item), QDS gets stuck in infinite loop.
It's unclear what exactly causes this loop, as it seems to be deep
inside QtDeclarative, so worked around it by enforcing 100 pixel
minimum width for item library.

Change-Id: Ib1193cce760098edd0df61177058f134f406101e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-03-09 12:33:24 +00:00