Commit Graph

67787 Commits

Author SHA1 Message Date
Christian Kandeler
89eb33dd67 CppTools: Use consistent sorting in the two outlines
Use case-sensitive sorting in the side bar outline, just like in
the editor outline.

Fixes: QTCREATORBUG-12714
Change-Id: I9d8243c61fcceb6e3d7b55e3b27fa5d20accccea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-06 14:04:57 +00:00
hjk
1a50b685ff Incredibuild: Introduce a CommandBuilderAspect
Covering the remaining bits in the buildsteps.

Change-Id: Ia1c51eb14c92bd377b7b5d6ddbd4658e9adc1b89
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-06 10:40:10 +00:00
hjk
5327b91e99 IncrediBuild: Rework BuildConsoleBuildStep
Change-Id: I7ab8bc18c229e1d748dbbc494b2ba254085c0e0e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-06 09:20:21 +00:00
hjk
9c930ac744 Meson: Cleanup mesonprojectplugin.*
Some unnneded code + final.

Change-Id: Ied2a29d20c624b8e5e2eefb56253b0412554ad44
Reviewed-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-06 07:47:43 +00:00
Alexis Jeandet
4dfb6f8c74 Meson: Add file watcher to keep QTC project in sync with introspection data
The most common case is when building triggers a new configuration process
which changes introspection data.

Change-Id: I7b23df4089898bb66a634b29809775d26011b315
Reviewed-by: hjk <hjk@qt.io>
2020-08-06 07:44:03 +00:00
hjk
632f102424 IncrediBuild: Rework IBConsoleBuildStep
- partially move towards using ProjectConfigurationAspect infrastructure
- fix display of default make arguments
- code cosmetics

Change-Id: I5ce3eb531c65b53d66411e959bcf79408418d5a1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-05 12:02:54 +00:00
Henning Gruendl
52f971ce5e QmlDesigner: Fix StatesDelegate TextField size
Task-number: QDS-2572
Change-Id: I0b797724ce626870921649807246ec692c7c40d3
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-05 11:39:44 +00:00
hjk
7f2b062045 ProjectExplorer: Use LabelPlacement::InExtraLabel as default in BaseBoolAspect
Change-Id: Iba1d44bf01b7364ce3b3787528fee184872d6927
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-05 11:12:12 +00:00
hjk
8245cd2c52 ProjectExplorer: Add BaseStringAspect::setToolTip()
Change-Id: I120b52ef0bc3a3ad180e739df353855cca4ffb8b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-05 10:54:14 +00:00
hjk
74b6e90b15 ProjectExplorer: Add LayoutBuilder::addRow() convenience function
... and use it in the DebuggerRunConfigurationAspect.

Change-Id: I1079f1a307d5e4b286d32570c48299d296fa3061
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-05 10:53:50 +00:00
hjk
2b10727625 ProjectExplorer: Make LayoutBuilder aware of aspects
Change-Id: I3091808309904eeadf5001a68438a9b501dd9fc7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-05 10:53:33 +00:00
Christian Kandeler
6a5cc268d2 Core: Fix crash on exit
We accessed a reference after removing the value from the container.

Change-Id: Idfb97093b7a23ba04e5cb0582c81031f431dce88
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-05 10:13:23 +00:00
Orgad Shaneh
3552c95980 Git: Make Add Branch dialog wider
Give it enough space for subject-based branch names.

Change-Id: If6ace5434903553330e802ff41f92083b0aee874
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-08-05 08:56:08 +00:00
Orgad Shaneh
7919fd550a Git: Replace subsequent invalid characters with a single underscore
... in the Add Branch dialog.

Change-Id: I7644cba6bf58316431e2daa9db5d2c26823c2711
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-08-05 08:55:01 +00:00
hjk
cdf83ee792 Utils: Use constexpr instead of constexpr17
Not needed anymore, we require C++17 nowadays.

Change-Id: Idea34512314d4df619f48832ea9d7b4994586c14
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-05 05:49:59 +00:00
hjk
d80a83c97c Qt6: Update ToolTip hack
Task-number: QTCREATORBUG-24098
Change-Id: I4ddc43ac0135ff22fe78f6a0efc75d7be2a3c7f4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-05 05:49:42 +00:00
Orgad Shaneh
14e3a379c1 Git: Suggest branch name based on the commit subject
... when the checked out commit is not a remote branch.

Fixes: QTCREATORBUG-24006
Change-Id: I175a3aedba88bd9e3b5cf298c5c161c56e9d0acd
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-08-04 20:23:45 +00:00
Christian Stenger
5299e58cea Shared: Do not copy or install binary artifacts
Change-Id: Ie3b12b790b014f28df31385969a5695bfa73b3a1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-04 12:52:58 +00:00
Christian Stenger
1de507a710 QmlDesigner: Replace QRegExp by QRegularExpression
Task-number: QTCREATORBUG-24098
Change-Id: I7cc6093b8275435f941bf4d9de59128570d90420
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-04 11:02:15 +00:00
Miikka Heikkinen
4d45e2defe QmlDesigner: Fix 3D overlay object colors
Recent changes to Quick3D changed how NoLighting materials work.
Emissive color no longer has effect in that case, so use diffuse color
instead.

Change-Id: Idde43f5bdf06a432a5dd06f9c52d6812fa790a73
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-08-04 10:51:58 +00:00
Robert Loehning
e4c1d52e88 BareMetal: Fix article
This also unites this with the nearly same string in
simulatoruvscserverprovider.cpp

Change-Id: I48930456f038577869ffade787e549fc396c365e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-08-04 08:18:28 +00:00
Alessandro Portale
b031a7c5cd ManhattanStyle: Add a manual test program for style development
Just a small tool for a fast overview. Actual fixes to the Manhattan
style follow later.

Task-number: QTCREATORBUG-23505
Change-Id: Iffd0db42d379c81c4e07e71919723cd6d684b514
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-08-03 17:24:57 +00:00
Alessandro Portale
4c6e5c2ba0 Tests: Introduce theme selection combobox in manual widget tests
Instead of duplicating a couple of code lines and hardcoding the
used theme, create a commonly used QComboBox as theme selector.

The selected theme remains stored in the settings.

Change-Id: I78f0d59a5594e7cc4f899656caaae1bb7caab385
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-08-03 17:24:48 +00:00
Christian Kandeler
e04577c517 PerfProfiler: Fix qbs build
Change-Id: Ic4552c6ccaf04d2d46dd736e0f5ada3e2fcda874
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-03 13:41:30 +00:00
Henning Gruendl
9f2bb4abaf QmlDesigner: Fix ExpressionTextField popup
Fix the ListView/Popup which is shown on the ExpressionTextField when
requesting auto completion.

* Fix key behavior of the auto completion list
* Adapt to the look and feel of the property editor
* Fix size and position of the TextField and the overlayed Label

Task-number: QDS-2561
Change-Id: Ie8df6a2960b1c273600543532f0a136eb0c542b5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-03 12:57:01 +00:00
Henning Gruendl
d1aabbe262 QmlDesigner: Fix change type to include signals
* Fix the change type dialog to also include checking for signals
* Add check for same type
* Add dynamic properties and signals

Task-number: QDS-2562
Change-Id: I34652e702d9051fb5a237afae584e345c731622f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-03 12:56:27 +00:00
Henning Gruendl
c113a7e851 QmlDesigner: Make use of states in ADS icons
* Add the on state to the tab close QIcon to have a different color in
  focused tabs
* Make the tab close icon checkable if FocusHighlighting is enabled to
  exploit the QIcon state for the color change
* Adapt the focused font color in the dockwidget stylesheet

Task-number: QDS-2558
Change-Id: I9fdfb93f0677f724336da8efdb2fb219af9c9e87
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-03 12:55:54 +00:00
Leena Miettinen
cf652d8a11 Qt Quick Designer: Fix tooltips and UI text capitalization
Follow the guidelines for capitalizing UI text.
Try to shorten the tooltips and use standard phrasing.

Change-Id: I76a0fdd99101d21a8023881988b1c7446d65b40b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-03 12:55:35 +00:00
Henning Gruendl
520c70bd8c QmlDesigner: Make use of mode for zoom icons
Add mode disabled to the zoom all button in FormEditor widget

Task-number: QDS-2558
Change-Id: Ie0da97cca5ea4c2411e21fc3cbea202397e02097
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-03 12:55:16 +00:00
Henning Gruendl
f726b0d90b QmlDesigner: Enable modes/states with icon font
Add functionality to use modes and states when generating a QIcon
from a font in StyleHelper

Task-number: QDS-2558
Change-Id: I764e8434a645d0984c6104cd1868fd5b0091d225
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-03 12:54:51 +00:00
Henning Gruendl
1fb1e829ee QmlDesigner: Replace alias icon with font icon
Task-number: QDS-2559
Change-Id: Ibcc4c6565eff6a5c5f7011fbf39af2277da9eec0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-03 12:54:12 +00:00
Henning Gruendl
bb79a7fb90 QmlDesigner: Fix duplicate items auto completion
Fix duplicate items in the auto completion result by trimming the
strings. Otherwise items like "Item " and "Item" will both show up in
the result.

Task-number: QDS-2561
Change-Id: I0244fed19cf358d5c72ee169cd8ffa13672edce2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-03 12:51:48 +00:00
Henning Gruendl
9d6f69abe9 QmlDesigner: Sort incompatible properties
Sort incompatible properties before showing them in the dialog.

Task-number: QDS-2560
Change-Id: I9871bc8ea488be04fcfac7b9c0f1a7cbf185072a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-03 12:51:22 +00:00
Henning Gruendl
9b249033d2 QmlDesigner: Set unique id as object name
Task-number: QDS-1821
Change-Id: I2021e2862797a40ea82ac4b279e33ba9e77a0dd7
Reviewed-by: Tanja Remes <tanja.remes@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-03 12:50:44 +00:00
Robert Loehning
64a641ec6a Use IDE_DISPLAY_NAME
Change-Id: If8ae9399a40a460b535faeec2320d1450e5099c5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-08-03 09:13:52 +00:00
Fawzi Mohamed
2ad89747c4 qmljs: qtdeclarative change 9ab1a6759018b78b0f160c5286f8b0235a34ec50
Support required list properties

The corresponding rules were missing so far.

Fixes: QTBUG-85716
Change-Id: Iaf0cbfbb8736929a213bd6bf329bb2ebdde652c4
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-08-03 06:59:36 +00:00
Fawzi Mohamed
1ea9d6ce87 qmljs: fix unreachable test for catch clause
Change-Id: Ica1ff034b88f06849026957c8beed2cda77badcc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-08-03 06:31:08 +00:00
Leena Miettinen
d59f22d000 Doc: Describe sorting the files in a QRC file in Qt Creator
Change-Id: Iba19105e3655e1c677188a9d9cecf786032d9f15
Reviewed-by: Federico Guerinoni <guerinoni.federico@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-03 05:52:59 +00:00
Leena Miettinen
6d67dc8515 Doc: Describe changing encoding if errors occur during diff
Change-Id: I54decf9aca700348134b96c6fd07172091a93dde
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-03 05:52:26 +00:00
Orgad Shaneh
4bfdc125ef Git: Sort includes in LogChangeDialog
Change-Id: I7005339456057be7b9c132088f74f243d71bdbff
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-08-02 05:01:25 +00:00
Orgad Shaneh
a48cde86f3 Git: Show full description on tooltip in commit chooser dialogs
Like Push to Gerrit, Rebase, Reset, Fixup Commit.

Fixes: QTCREATORBUG-24366
Change-Id: I0f596f84661a1a4f37fe971683cc0d985a6c9b1f
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-08-02 05:00:50 +00:00
hjk
78406916a3 Debugger: Avoid use of QHash::values(...) in QmlEngine
This will be gone in Qt6 and seems unnecessary here as insertion
into the hash explicitly checks containment first, so this was
effectively not used as QMultiHash anyway.

Change-Id: I3f6ef9473930f72ee9b5f81f3623829d63619cc0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-31 13:16:40 +00:00
Christian Stenger
57c6a32b10 Dumper: Fix dumping of enum values for cdb
Fixes the Bitfields test.

Change-Id: I2aab020f1dc8be40ab994586d0989452c80bb8e3
Reviewed-by: hjk <hjk@qt.io>
2020-07-31 13:09:02 +00:00
Christian Kandeler
4bbf76a344 ProjectExplorer: Allow to add custom output parsers programatically
This enables plugins to add custom parsers to the global pool.

Fixes: QTCREATORBUG-24403
Change-Id: Id600c12fc66876879a5a2975139d72f87c4f2e30
Reviewed-by: hjk <hjk@qt.io>
2020-07-31 12:19:34 +00:00
Christian Kandeler
530e8568b1 OutputFormatter: Fix linkification of relative file paths
If we encounter a relative file path that can map to more than one
absolute file path, we do not linkify it, as that would be misleading.
However, we forgot to check whether the "different" candidates are
really different. For example, consider the following situation:
    - We have a header file /usr/include/header.h.
    - This file shows up in the compile output as "../header.h".
    - At that time, we have two search dirs /usr/include/libA and
      /usr/include/libB.
    - This resulted in two candidate file paths
      /usr/include/libA/../header.h and /usr/include/libB/../header.h
    - The relative path was rejected as ambiguous.
Fix this by checking for duplicates when gathering candidates.

Change-Id: I139b848d938113f1b5a959d8043411f7f3e809be
Reviewed-by: hjk <hjk@qt.io>
2020-07-31 11:32:47 +00:00
hjk
996f490e97 Meson: Do not use QFuture implicit conversion
QFuture::operator T() will be removed with Qt 6

Task-number: QTCREATORBUG-24098
Change-Id: Iec7d8d95ab965867e8fa5ddaac496a4129ed08a9
Reviewed-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-31 11:19:15 +00:00
Christian Kandeler
3f9427200b CppTools: Fix formatting for lambdas with trailing return type
After the arrow, the state is still the same, as now a type is expected.
Only after the opening brace does the actual function start.

Fixes: QTCREATORBUG-18497
Change-Id: I7bf18fbd6907d36f8869af3a78ad617cf0ee9dbb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-31 08:15:18 +00:00
Christian Kandeler
c24320123b qbs build: Fix spurious re-resolving
The pluginjson module records the VCS state by default, which means qbs
re-resolved the project after every git action. Prevent that.

Change-Id: I24cf1d658ba847b327be018749806856a6e7da1b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-07-31 08:13:40 +00:00
Christian Kandeler
21fbf36a5d Cmake: Fix compile output glitch
Using a dedicated OutputLineParser ensures that we only ever see
complete lines and thus prevents "partially red" lines in the compile
output pane.

Fixes: QTCREATORBUG-24209
Change-Id: I12b3de70b81789afe727b66e366facdcc81f8ab8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-07-31 08:12:54 +00:00
Christian Stenger
2944b33530 Tests: Fix codemodel check test
Change-Id: I9ca0fec928ac90fd5951fc54963ba5e96d5a53a6
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2020-07-30 13:43:12 +00:00