Commit Graph

63610 Commits

Author SHA1 Message Date
Christian Kandeler
c10ae65f24 Core: Provide a default output formatter
This allows us to get rid of a bunch of checks and a parallel
implementation.

Change-Id: Icbd23150700d26d96f5163418e46bf83e374e98a
Reviewed-by: hjk <hjk@qt.io>
2020-03-16 16:10:12 +00:00
Christian Kandeler
c8e560b3bd ProjectExplorer: Fix MSVC compatibility check
Amends bd03041428.

Fixes: QTCREATORBUG-23706
Change-Id: I2ebf4c350cd0ff6b95535f614eec2379a704a0d4
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-03-16 15:23:03 +00:00
Eike Ziller
ba4a604d68 Editors: Fix top/bottom split with cursor visible at end of document
It did not center on the text cursor.

- Fix lastVisibleBlockNumber() to return the last block if the editor is
scrolled to the bottom (and there potentially is no block located at the
very bottom edge of the editor widget).
- Fix comparison of block numbers (0-based) with line numbers (1-based)

Change-Id: I21405443bea3533e393a7cf320ded6d47f647949
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-16 14:48:36 +00:00
Miikka Heikkinen
2c3f31bc93 QmlDesigner: Add a simple wireframe cone model for edit 3d spotlight
Change-Id: I013e4fc2d77b49694d887e8cadc05584a904ed62
Fixes: QDS-1819
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-16 13:37:49 +00:00
Christian Kandeler
f7d91a01d1 QmakeProjectManager: Use delay timer from base class
Change-Id: I38b55efc34b34b58430d1d665eb6672c3de89b4f
Reviewed-by: hjk <hjk@qt.io>
2020-03-16 13:00:16 +00:00
hjk
d3f79fcc68 AutoTest: Use ITestFramework * instead of its id in some cases
Change-Id: Ic327e31185247b6479c78af8bf8156f44bb4bdfb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-16 12:18:29 +00:00
Assam Boudjelthia
e857b02579 Android: rephrase some bad UI text sentences
Change-Id: If563b0778ceafcaeceb13f697d273c69f484929b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-03-16 12:08:42 +00:00
Leena Miettinen
7be9d0f567 Sessions: Fix UI text according to the guidelines
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: Ie74ee222f5ff7393b65c6f1128cf2e64bb0007ae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-16 11:54:24 +00:00
Leena Miettinen
268a61d530 CTF Vizualizer: Fix UI text according to the guidelines
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: I9778dd6af9322d068ac1715876774d4ff5efe161
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-16 11:54:08 +00:00
Christian Kandeler
a102c11d00 Qmake: Add some debug output for file add/remove operations
This will help collecting feedback from users affected by bugs.

Task-number: QTCREATORBUG-22508
Change-Id: Idfc22245587dd2d71b229b4ab6c7562fb7a5ecfc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-03-16 11:13:32 +00:00
Eike Ziller
9295bfe3e4 Fix split side by side behavior again
After fixing top/bottom splits, the side by side splitting scrolled
wrongly if the cursor position was somewhere at the bottom of the view.

Avoid restoring state if the editor is not in a layout, since the
behavior can now differ depending on it. Calling restoreState before
that, would make the behavior depend on the default size of the widget.

This has the additional benefit that editors can adapt (e.g. make a
previously visible text cursor visible) if they are moved/duplicated
when opening a document in an existing split, not only when creating the
split.

Change-Id: I3916eb20c2251dbeac4b604f96af647cf142fcad
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-16 10:19:04 +00:00
hjk
c1f210dd69 AutoTest: Provide easy Id<->ITestFramework * mapping
They are 1:1, idea is to replace (most of the) Id uses with the
framework itself, overall simplifying e.g. TestFrameworkManager.

For a salami-tactics transition, easy convervion between the two helps.

Change-Id: Ib6d166ae34a3189d900353be7a181a1e45467a7c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-16 09:51:04 +00:00
Miikka Heikkinen
010bbb8ae0 QmlDesigner: Show selection box for component scene roots in edit 3D
Components typically have Node as their root item, so having a
component as a scene root detects as having a plain Node as scene
root, which normally doesn't get a selection box.

Change-Id: I66ae1dc3ade4b6f822d768cf71e8feceb0ffa06d
Fixes: QDS-1636
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-16 09:01:54 +00:00
Thomas Hartmann
ba195be0a0 QmlDesigner.Flow: Rename break property to breakPoint
"break" is a JavaScript keyword.

Change-Id: I05d0e7cb342eaacea0da404af32a71ed4e74d5f5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-16 08:46:56 +00:00
Thomas Hartmann
f4253fa1c0 QmlDesigner.Flow: Improve connection drawing code
This makes the drawing code more robust against zoom level changes.

Change-Id: I5792c8c8e52950576eb2ba62797d19c3dcd979cb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-16 08:46:44 +00:00
Leena Miettinen
dd91e8e062 CppTools: Fix UI text according to the guidelines
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: I35a1782f62514dfb6ea7e1e3cf334c8a5615fd74
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-16 08:28:53 +00:00
Assam Boudjelthia
7fd0f30776 Android: use QListWidget to show defined NDKs
Use QListWidget to show all installed NDKs (from SDK manager), and NDKs
Added manually by the user. Each item has an icon to indicate if it's
removable when added by the user, or non-removable if installed from the
SDK manager.

Change-Id: I26ae5909ce930d5cc8af561b6b4e9cc5415d12f1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-16 08:21:22 +00:00
Eike Ziller
22cdc47077 Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp

Change-Id: I4a90920e52dbbe9eb46aef3437ee3c5a6e7b31c6
2020-03-16 08:30:33 +01:00
Kai Koehne
e9f54804e1 Doc: Remove mentioning of OpenSSL version
The version we ship in 4.11 is 1.1.1d  Chances are we will forget
updating this version number in the future too, so let's just not
mention it.

Change-Id: Ibb8248a4eaa38f6dab93af8170f1f77a2dff3c28
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-16 07:21:13 +00:00
Eike Ziller
3faa91945a Merge remote-tracking branch 'origin/4.11' into 4.12
Conflicts:
	src/plugins/autotest/testrunconfiguration.h

Change-Id: I1bc156ef4acbf9109d809e4f8fe1c9e73444040f
2020-03-16 07:19:52 +01:00
Christian Kandeler
fc9bdf1255 Core: Remove unused OutputWindow accessor
Change-Id: I0845eb0e10f970a473ee5ccd13f7586a5c21b6a6
Reviewed-by: hjk <hjk@qt.io>
2020-03-13 15:03:56 +00:00
Christian Kandeler
54bf94afaf Utils: Remove unused signal from OutputFormatter
Change-Id: I337a78f9edf8b63869b117e031c648e52e3203a0
Reviewed-by: hjk <hjk@qt.io>
2020-03-13 15:03:30 +00:00
Denis Shienkov
d44b181923 BareMetal: Fix parsing of software pack description files for UVSC provider
A target device info locates in the *.pdsc files provided by the device
description packages which are installed into the Keil MDK-ARM instance.

We parse this files to provide possibility for the user to choose a
specific MCU target for debugging.

Previous parsing implementation was complicated and did not take in
account the specific *.pdsc format features:

 * https://www.keil.com/pack/doc/CMSIS/Pack/html/packFormat.html

It turns out that the following entries as 'family', 'sub-family',
'device', and 'device-variant' may contain an attributes with the
same names. So, we can simplify creation of an items, use only one
base implementation for all items. Besides, a new implementation
simplifies parsing and for other *.pdsc files (e.g. non only for
STMicroelectronics).

Tested with Keil MDK-ARM v5.23 using STM32 NUCLEO-F767ZI board.

Change-Id: Idd51b8fa3e36a7896254b4cb8aa4c1287b9f0df5
Reviewed-by: hjk <hjk@qt.io>
2020-03-13 14:58:15 +00:00
Henning Gruendl
e3e62d852f ADS: Fix workspace dialog on removal
- Fix an issue where the list of workspaces is not correctly updated
  after removal of a workspace in the dialog
- Fix initial sorting of the workspace model

Change-Id: I0c16aabc1fdcc2690fcb83e40b0d5d16cb6c72ba
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-13 14:34:53 +00:00
Henning Gruendl
5803448ea0 ADS: Add workspace switcher ComboBox to Toolbar
Change-Id: Ice2e38ac8fd7a0a4ef174d443b9f7e308239aa40
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-13 14:34:44 +00:00
Eike Ziller
038e8491ee litehtml: Fix selection artifacts with scaled view
If you zoom into a page (Ctrl-+) and then select, artifacts could be
left behind when dragging or removing the selection again.
Fiddle around with coordinate transformations (with regard to rounding)
to fix that.

Change-Id: I68c29d8e3559b90dbb3b93550338e483d14731bf
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-03-13 14:17:16 +00:00
Mahmoud Badri
11bd2f8deb Enable Copy, Cut, and Paste in the Editor 3D
Task-number: QDS-1563
Change-Id: I22c3017b8c158d8bc084f050baef89fa8fffd365
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-13 13:25:58 +00:00
Christian Stenger
38458c3e40 Squish: Fix tst_qml_locals
The content of the locals and expressions had
changed as it nowadays provides information
on the qml engine as well.
Adapt the test accordingly.

Change-Id: Ib5fa96e3150206a374ac5e115e789cc3b983497b
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-03-13 12:35:45 +00:00
Henning Gruendl
0b7970feb4 ADS: Fix repeatedly dropping in same area crash
6c687d28def5c24f3eeb67c9e13d5cfab40cebd0
1c2383f8eb94bc8570e554efa5f842a8ab1461ea

Task-number: QDS-1751
Change-Id: I933b1f53da8ce423cd5d38ff2863f58606006596
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-13 12:29:51 +00:00
hjk
2c79196ab5 AutoTest: Tie framework settings explicitly to ITestFramework instance
This leaves no doubts regarding lifetime and type.

Change-Id: I1fdd60427a469f32236ea0fa923ec9fa308c338e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-13 11:12:36 +00:00
Miikka Heikkinen
206e7d3e70 QmlDesigner: Fix crash at project open when 3d edit view is undocked
Task-number: QDS-1739
Change-Id: I7a97fb8e22acca22744443b2a664ec230465905d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-03-13 10:43:03 +00:00
Miikka Heikkinen
83d590950b QmlDesigner: Edit 3D view icon update
Added icon for spot light gizmo and updated directional light icon.
Removed icons that are no longer needed on puppet side.

Change-Id: Id1e72c80e122250f7edc8a69a0e5720e755b96fc
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-03-13 10:08:14 +00:00
Leena Miettinen
83a60f10ce Doc: Update info about managing workspaces
Change-Id: I1cd79ac60641d99b86b246cb540cb6a9e70d1f30
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-13 09:37:58 +00:00
Christian Kandeler
ea8efe58c6 QtOutputFormatter: Use cursor object from base class
There does not seem to be a reason for the duplication.

Change-Id: I7c9b016c76a9aa93ccd93af0aea931fa5b148300
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2020-03-13 09:04:48 +00:00
Leena Miettinen
0e71463b91 Doc: Describe Qt Quick Designer annotation editor
Fixes: QDS-1485
Change-Id: Iabb3c6efa738df028f94e14810f9b4cfaad7b2dc
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-12 15:09:10 +00:00
Federico Guerinoni
f6cfcc4411 QrcEditor: Add action for ordering resource list
Change-Id: I8c2d53649af420b324d6a0f57b09d1cd4ccd5e25
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Andrea Ricchi <aricchi95@gmail.com>
2020-03-12 14:26:51 +00:00
Miikka Heikkinen
644493fa59 QmlDesigner: Delay camera frustum geometry update in edit 3D view
Calculating camera frustum geometry requires linked camera spatial
node to be up-to-date. However, we can't control the order in which
the spatial nodes of cameras and geometries are updated, so geometry
update will often happen first. Therefore we need to defer geometry
update to the next frame when we detect camera change.

Change-Id: I056eb1bf95db357a73511a6bb7ef0c55c6f4befa
Fixes: QDS-1649
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-03-12 13:37:53 +00:00
Denis Shienkov
818d79b655 BareMetal: Add support for peripheral registers view using UVSC provider
Now it is possible to use the SVD files to read or write the peripheral
registers of a target device.

By default a paths to the SVD files automatically comes from the installed
"Device Software Pack" database and don't need to be changed by the user.
But, if a user needs to change the SVD file, then it can be done via the
provider's device selection options.

Tested on Windows with Keil MDK-ARM v5.23 using the STM32 NUCLEO-F767ZI
board.

Change-Id: Ia39e8d9a25cd24461804d47830ee9e8f01486108
Reviewed-by: hjk <hjk@qt.io>
2020-03-12 12:46:15 +00:00
Assam Boudjelthia
be8cdeafd6 Android: Allow adding OpenSSL libs directly from project settings
This serves as a convenience addition to allow users to directly
include OpenSSL prebuilt libs for Android. The path of the OpenSSL
would be defined once in the Android options page, and always used
to include the libs when needed by the user.

How this works:
1- A download button is provided, it first tries to automatically
git clone the OpenSSL repo to the defined path. If the cloning fails,
the repo URL is opened externally for maunual download.

2- If SDK tools auto download is used (like for first time setup),
the OpenSSL download will start after SDK eseentials are installed.

3- Once the libs path is set, it can be used by AndroidBuildApkWidget
to include() function to the project (qmake/cmake). It also, should
detect if the include() part already exists in the project file.

Task-number: QTBUG-80625
Change-Id: I338e916f03f4ff55db25a118f1ea08f1da5dd103
Reviewed-by: hjk <hjk@qt.io>
2020-03-12 12:09:54 +00:00
Ville Voutilainen
a92156b08f Android: fix a logical thinko in manifest editor's icon handling
Change-Id: I9b9a4b602c8b01f4c9bc9c11fd0f029d6eff9596
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-03-12 12:04:59 +00:00
Robert Loehning
810538c281 Squish: Adjust expectations in suite_CSUP
Task-number: QTCREATORBUG-22728
Task-number: QTCREATORBUG-22729
Task-number: QTCREATORBUG-23159
Change-Id: Iad21fa8e82f314bc7bde42dc184cf72553eab3a7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-12 12:04:20 +00:00
Christian Kandeler
1b9804693d CompilationDb: Make use of BuildSystem base class parsing infrastructure
Change-Id: I928e173b35b87c0fcb8fc97785ddfa4a2414740d
Reviewed-by: hjk <hjk@qt.io>
2020-03-12 11:57:55 +00:00
Christian Kandeler
c679a3ac72 QbsProjectManager: Make more use of base class infrastructure
No need to duplicate the timer. Now BuildSystem::isWaitingForParse()
returns the correct result.

Change-Id: Iab754b2c488c48302039988bd36e51f00e0f1196
Reviewed-by: hjk <hjk@qt.io>
2020-03-12 11:57:38 +00:00
Leena Miettinen
757e55d50b Nim: Fix UI text according to the guidelines
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: Iac90517e08ce5182baf810b0ff4b48dc0e40165e
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2020-03-12 11:54:32 +00:00
Leena Miettinen
0bd2a3d4d4 CppCheck: Fix UI text according to the guidelines
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: I7ad156fd5dca688a05bff3fc394ca67356378eb1
Reviewed-by: Sergey Morozov <dev@gres.biz>
Reviewed-by: hjk <hjk@qt.io>
2020-03-12 11:54:08 +00:00
Christian Stenger
38cf9047c9 Squish: Adapt to changed tool tip text
Change-Id: I7c86bcce5ee5c58147810243d6b7e7c59df94f21
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-03-12 11:51:35 +00:00
Friedemann Kleint
b8ad0fdae9 Fix QPainterPath-related compilation errors in Qt 5.15
Some include of QPainterPath was removed in Qt, causing errors like:

easingpane\easinggraph.cpp(258): error C2079: 'path' uses undefined class 'QPainterPath'
easingpane\easinggraph.cpp(275): error C2027: use of undefined type 'QPainterPath'
easingpane\easinggraph.cpp(305): error C2664: 'void QPainter::drawPath(const QPainterPath &)': cannot convert argument 1 from 'int'
to 'const QPainterPath &'
easingpane\easinggraph.cpp(305): note: Reason: cannot convert from 'int' to 'const QPainterPath'
easingpane\easinggraph.cpp(305): note: use of undefined type 'QPainterPath'
...

Add the missing include statements.

Change-Id: I4f3383cbcec891a52480a683c9c76ed5deee2b2a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-12 09:47:02 +00:00
Christian Kandeler
1de9e9e402 Android: Add missing reset of state variable
The m_skipBuilding variable in AndroidBuildApkStep needs to be re-
calculated on every call to init().
Also add some debug statements that will help us find out why it becomes
true in the first place.

Task-number: QTCREATORBUG-23572
Change-Id: I058b58cf0e511557d1fad7e5bd03048a7d8b9c69
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-03-12 09:19:18 +00:00
Miikka Heikkinen
2c842453b0 QmlDesigner: Add light meshes to edit 3d view
Change-Id: I996498fde14510fc78c729f56cb8d46b28b233bb
Fixes: QDS-1634
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-03-12 09:06:48 +00:00
hjk
3d67fbc55f Qmake: Do not delay initial parsing
And add some logging to make the situation debuggable.

There are a lot of reasons that currently trigger (or attempt to
trigger) parsing, including two unconditional ones on build system
construction and fromMap. Some can be avoided, but keeping track of
which one will be the "needed" one gets tricky without additional state.

So turn it around and try to reparse "immediately" until such a parse
finished. The parser itself is robust enough to deflect repeated
runs before the first one finishes.

Change-Id: Ic992b8730fa3a09ca14532cdd9bdbab4c245cb41
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-12 09:01:26 +00:00