Commit Graph

66760 Commits

Author SHA1 Message Date
Christian Kandeler
3ff8c42431 ClangCodeModel: Use a configurable timeout in the tests
Change-Id: Ie3923217f79a72d2774aaa2a499144c3191cb478
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-19 08:18:14 +00:00
David Schulz
30f21bcf01 LanguageClient: Generate BaseMessage only once per send content
Change-Id: Ife4135dce924db83b8539035b4837ecee1403ad8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-19 08:16:13 +00:00
Christian Stenger
6c385365d5 QmlDesigner: Fix qbs build
Change-Id: Ia2671a5491b8f5dbc8e4b771c5fe2a080a76b863
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-19 07:53:39 +00:00
David Schulz
05ad4e3daa TextEditor: fix selection highlight
Also compare the anchor when looking for the selection. Otherwise we
might get a selection highlight that expands on adjacent extra
selections like code model warnings.

Change-Id: Ib8460c1089ed69d14b7a408ca70e7ac1f8642f6e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-19 04:16:13 +00:00
Lukasz Ornatek
80dda222e0 Automatic generation of Description & Display Condition tab
Task-number: QDS-2862
Change-Id: I367f336e84025b593e51faf282ad9c923cfeac54
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
2020-10-16 11:50:09 +00:00
Assam Boudjelthia
4946677df4 Android: fix aab label name and supported versions
Task-number: QTCREATORBUG-24681
Change-Id: I5634deaf395d547d2659d71d1612897e1a3d9a2b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-10-16 11:43:37 +00:00
Christian Kandeler
dd62254e4e QmakeProjectManager: Make "system" execution opt-in
It has too many side effects.
Amends fcd6384f4d.
T_SYSTEM and E_SYSTEM are now treated the same.

Fixes: QTCREATORBUG-24551
Change-Id: Ib6df2762d329f2ddc0dd66190454159d446a9ac9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-10-16 10:40:45 +00:00
Marco Bubke
d1b0c12d6b QmlDesigner: Add image cache
The image cache is saving images and icon of this images in a sqlite
database. If there are no images they are generated in the backgound.
The icons are fetched by item library.

Task-number: QDS-2782
Task-number: QDS-2783
Task-number: QDS-2858
Change-Id: I5a32cccfef7f8fd8eb78902605a09f5da18ce88e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-16 10:01:21 +00:00
Henning Gruendl
58e612c85f QmlDesigner: Sort items in FileResourceModel
* Sort items in FileResourceModel
* Add FileSystemWatcher on directory

Task-number: QDS-2919
Change-Id: I0ba50f03d4f901a48709ed0cc0e7f05d3037aeec
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-10-16 09:32:37 +00:00
hjk
5a97fa53dc Android: Aspectify AndroidDeployQtStep
Change-Id: Ibc2f04336831494c04a2283a59e1f550776c8bf3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-10-16 07:24:46 +00:00
hjk
5467faa0d7 Debugger: Use -file-symbol-file for core files with GDB
Task-number: QTCREATORBUG-24541
Change-Id: Ib6d070629f5a7d1505c272ce78f99dc14cd15fdc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-16 07:24:28 +00:00
Christian Stenger
d11aa98219 AutoTest: Prefer active target over further
If there are more than one target for a run configuration
we ended up in the first matching.
Tests may use different environments to test different things.
If the user tried to handle this by using a modified
environment for different targets failed even when the
correct target was selected.

Change-Id: Ie954c985969ffd187fe60b4ecb86aa2717d559f1
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-16 06:22:31 +00:00
Thomas Hartmann
4cb4bcec0f QmlDesigner: Fix recent regression
After calling differenceHandler.typeDiffers() the modeNode
can be invalid. We have to account for this.

Task-number: QDS-2954
Change-Id: I76e28dcd3f1a824802e60bf47b773f5b8cb3d15a
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-15 18:20:02 +00:00
Thomas Hartmann
5edac46edb QmlDesigner: Fix UrlChooser
Change-Id: Ie5a6297cf29dd6e9a120293346431c497805a28e
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-15 17:03:49 +00:00
Assam Boudjelthia
c121e48589 Account for qmake.bat script for Qt 6 targets
Qt 6 targets that are built with CMake have a qmake.bat instead
of qmake.exe, while they can be registered from the Qt installer
using QC's sdktool, it's not yet possible to select a new version
manually because the FileDialog selection offers only qmake*.exe.

Fixes: QTCREATORBUG-24721
Change-Id: I647be1e0fba2f306402b8dbed747e9614a4eb0ea
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-15 10:12:23 +00:00
Christian Kandeler
e7df6bba18 ClangTools: Further increase the test timeout
The clazy tool in particular can be exceedingly slow on Windows.
Increase the default timeout and also add a hook to set the timeout at
runtime via the environment.

Change-Id: I94c46ce03f8348fb239870df4d5627bf8d545307
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-15 07:54:19 +00:00
Christian Stenger
70851d371d QmlDesigner: Fix compile of tests
Change-Id: Idd2097a7e571d5891c3769102bb7b0ebd9264ac6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-15 05:55:39 +00:00
Marco Bubke
60567d385a QmlDesigner: Bind meta info cache to model
A global variable is not helping for multithreading and the cache has
anyway a 1:1 relationshit to the model.

Change-Id: Ic05f32744b70ef63aa5ae7d475afc0b5b17f2f09
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-14 17:00:31 +00:00
Marco Bubke
3e9e768b35 QmlDesigner: Bump the C++ version to 17 for the qml puppet too
Task-number: QTCREATORBUG-24684
Change-Id: I2502593d45f93b36162a4009cca238a83da2dc53
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-14 16:59:20 +00:00
Orgad Shaneh
e3ace00a43 Git: Deduplicate stderr output on commit
It appears while the process is running, then printed again when it's done.

Change-Id: I86737eccfcf34d82ccca1ec4b9a7f42fc66bf86c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-10-14 16:49:51 +00:00
Tim Jenssen
57e77ec449 qmlpreview: fix calling right localeIsoCode method
Also add some QTC_CHECK to get at least some warning
in case the functions are renamed in future.

Change-Id: Ie4e78855152e9946950603c95fa881755e850c62
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
(cherry picked from commit 165ccb828d)
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-14 15:14:48 +00:00
Tim Jenssen
7cc478cfb1 Revert "QmlDesigner: Keep possible imports updated"
This reverts commit a9619b53f3

Reason for revert: broke stop puppet debugging feature

Change-Id: I88cf4ca7503a6bd7c3d8309cd7c3220428d07a20
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-14 12:17:08 +00:00
Christian Kandeler
76febea8ee QmakeProjectManager: Ensure consistent include path lists
... before and after a build.
The previous algorithm did not guarantee the same order, leading to
failure when analyzing an unbuilt project with clang-tidy/clazy.

Change-Id: I8a700408ca0c23b1b14b47ebfe334a41c52afa5b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-14 08:55:56 +00:00
Vikas Pachdha
6fe4f028a4 Designer: Relax type difference check on node sync
Task-number: QDS-2535
Change-Id: Ic762d40f9088d287db4d7c0c88bb7817b2bf6475
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-13 10:42:39 +00:00
Christian Kandeler
2e25e2859d CppTools: Fix test on Windows
Another CRLF issue.

Change-Id: I172bcef5beabf1c85eb3c0b66a1839c03a870f8c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-13 08:27:20 +00:00
Knud Dollereder
19f2d3a7a8 Enable touch-pad navigation
For the curve-editor, transition-editor and timeline
Renamed ruler-scaling-factor to zoom in order to not confuse it with
ruler-scale-factor

Change-Id: I099e8e9a1e6092c9abb0a1a935fb8510aa90d5e4
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-12 16:39:04 +00:00
Henning Gruendl
4ba6c7988e QmlDesigner: Icon visibility in navigator
Show alias, visibility and lock icons in the navigator only when either
checked or hovered.

Task-number: QDS-2785
Change-Id: I1eca1b9f44cfbdd839daa64849156e1c9ffa4acd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-12 15:25:06 +00:00
Henning Gruendl
2860e57112 QmlDesigner: Add lock functionality to navigator
* Update icon font and change related theme and constants files
* Add locked column to Navigator
* Add auxiliary property "locked"
* Integrate locked feature into the following components:
  * Transition Editor
  * Connection Editor
  * Form Editor
  * Text Editor
  * Timeline
  * Navigator
  * State Editor

Task-number: QDS-826
Change-Id: Ibf3ae96e0d5daeb1ab00279b94df5aaabe75e0bb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-12 15:24:55 +00:00
Leander Schulten
15f39cf37c CppEditor: Fix Typedef Handling with 'Remove Using Directive' QuickFix
Previously, typedefs were ignored and the new code became invalid after
applying the quickfix.

Change-Id: I0d4295e90d02dfacc3edac5ac3f96d9edbeaf662
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-12 14:34:54 +00:00
Thomas Hartmann
7ec2fd482e QmlDesigner: Show anchors menu only if applicable
Change-Id: I09e6e14f96b62b561027694ebc5a73b51c6ab8d8
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-12 14:32:55 +00:00
Thomas Hartmann
9e064b158e QmlDesigner: Disable group menue if selection is empty
Change-Id: I1b64bbe7a6217ed08c8a1f72435cd67eea6209a0
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-10-12 14:03:30 +00:00
Orgad Shaneh
f60302591b Merge remote-tracking branch 'origin/4.13' into 4.14
Change-Id: Ifa2e1ced939e1d049ba6de667b31ab9945094b87
2020-10-12 14:55:54 +03:00
Christian Kandeler
023a77ea80 CppEditor: Consider templates in "complete switch" quickfix
Fixes: QTCREATORBUG-24752
Change-Id: I39bc007e5f493a9826adb4575eb210bf9ec21159
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-10-12 09:01:29 +00:00
Christian Kandeler
bd05e01e3d ProjectExplorer: Make default build dir template backward-comaptible
Otherwise, switching back and forth between QtCreator 4.13/14 will
inject new variables into the old Qt Creator, where they are not
available.
Amends b55825a420.

Fixes: QTCREATORBUG-24740
Change-Id: I6c77626c790005c80b716e5b8006d7034c0f150b
Reviewed-by: hjk <hjk@qt.io>
2020-10-12 09:00:28 +00:00
Christian Kandeler
996ed6e378 ProjectExplorer: Fix compile output window scroll issue
Flushing the formatter directly from the build manager interferes with
the scrolling logic in OutputWindow.

Fixes: QTCREATORBUG-24728
Change-Id: I018944a44bcc3115c17ba83708da8f155b496f39
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-10-12 08:59:03 +00:00
Christian Kandeler
e76d294c00 ProjectExplorer: Fix small visual glitch when rebuilding
All but the first build would insert an extra newline at the top of the
compile output window.

Change-Id: Ief88acfb6226ec2d1de9865f041e9f07c48f6c49
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-10-12 08:58:25 +00:00
Miikka Heikkinen
47714c38c6 QmlDesigner: Return placeholder preview image for non-visual components
Preview image is returned when a 2D item render results in a blank
image.

Also improved device pixel ratio handling. No longer always render
preview at 2x ratio, if not needed.

Change-Id: I67b7563dffea523ea85be23b6a0e8b802c0f03fb
Fixes: QDS-2893
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-10-12 07:33:56 +00:00
Tim Jenssen
ddb078404a qmlpreview: add test translation color settings
Change-Id: I9b11fcf1fdae39b089887884a3d96cc8648a0c8a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-12 07:27:57 +00:00
Tim Jenssen
d674548040 qmldesigner: fix missing update after setFrameColor
Change-Id: I9d809bb62bdd3b0d141e1cff39cbf4a9fca58c39
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-10-12 07:27:48 +00:00
Tim Jenssen
22545933b6 qmldesigner: use right include syntax
Change-Id: Iafd04ad287bac6b0c94359fa54893904de61aa96
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-10-12 06:52:42 +00:00
hjk
632582371c ProjectExplorer: Restructure BuildStep summary update
Move the first update from immediately after setting the updater (not
necessary when the summary never got shown, and too early to take
fromMap() data into account) to widget creation time.

This fixes the "Invalid Command" display for CustomBuildSteps
after project loading even if the command is valid.

Alos make sure we don't accumulate connections on repeated
config widget creations.

Also make sure this is not lost in createConfigWidget
re-implementations.

Change-Id: Ib8d07fbf1f0aefc45c66f74617c8fc882dc1f68e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-09 15:18:44 +00:00
Thomas Hartmann
29c833d54f QmlDesigner: Implement different render path for Qt 6
When building with Qt 6 or if qmlpuppet_unifiedRenderPath is set
in the environment we switch to a different render path.
In this case we use QQuickWindow::grabWindow() and render the root item.
No composition is done in the Qt Creator process anymore.
This is a similar approach we already take for the 3D view.
Performance is acceptable and we fix rendering issues related to
effects and layers.

Change-Id: Ic963eca047e0bf16ca3a099ec94658ae2af0fb63
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-10-09 15:13:39 +00:00
Leena Miettinen
2fe99cef9f Doc: Describe new actions on CMake parameters
Multi-selection of parameters is now enabled, as well as
clearing the selection, unsetting multiple parameters at
a go, and undoing the unsetting.

Task-number: QTCREATORBUG-24529
Change-Id: Ie87e6e5bf081fd6d70e3a9461ca8489fb3a71589
Reviewed-by: hjk <hjk@qt.io>
2020-10-09 14:42:58 +00:00
Eike Ziller
8add61b216 Merge remote-tracking branch 'origin/4.13' into 4.14
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ia779a511d73d86d79dbcecd8cc3763cf3d605a87
2020-10-09 16:35:27 +02:00
Eike Ziller
75adba735b CMake build: Build Qbs if the submodule is available
Includes update of Qbs to current head of master, which enables this
feature on the Qbs build system side.

Fixes: QTCREATORBUG-23905
Change-Id: I9a537b640b7f7a753839ace3e44d174c8e0af526
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
2020-10-09 14:27:54 +00:00
hjk
a722b7a093 ProjectExplorer: Fix CustomProcessStep
Only display worked, the command was not used for running.

Change-Id: I6afc65d97310fe14a58136393bd0657127d8afca
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-09 12:08:11 +00:00
hjk
96d33bb8f8 ProjectExplorer: Remove unused KitAspectWidget::dirty signal
Change-Id: Iabf37b3806eae4dcde73927bd540723a7b8f88bb
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-09 11:49:20 +00:00
Dominik Holland
db4b3641f5 qmlprofiler: Fix a crash in the rangeFilter
Always check the stack before popping an element.

Fixes: QTCREATORBUG-24730
Change-Id: I7dc6363137ef002219fbc49b7343cff8112a58c2
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2020-10-09 11:38:28 +00:00
Alessandro Portale
6e70ced113 ProjectExplorer: Show "<file path>" for "-ensure-kit-for-binary"
Don't show double angle brackts: "<<file path>>"

Change-Id: I19a346b216b9b96f28c40b2d9bd5659449926174
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-10-09 09:42:25 +00:00
Leena Miettinen
b5af9151bc Doc: Update info about using Clang tools
Task-number: QTCREATORBUG-24529
Change-Id: I3abca4ae3061f1b940ad4f0ee0471bb84a05e63f
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-10-09 09:39:55 +00:00