Commit Graph

67787 Commits

Author SHA1 Message Date
hjk
b4a9801f05 Android: Drop some unneeded semicolons in class declaration
Less warnings. Amends f46099d21e.

Change-Id: I50f0bec7b0db9d9e16191523b183496c4cd5b552
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-03-18 13:33:11 +00:00
Thomas Hartmann
a999295576 QmlDesigner: Add include for QPainterPath
Change-Id: Ia7e24eab0f33d628bf7c50287d7dd6c72634bc42
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-18 12:37:53 +00:00
Assam Boudjelthia
41dd8dc8ef Android: read SDK configuration from user editable path
By default, copy the sdk_definitions.json to Qt Creator user resource
path. The user can use that to make any updates if desired.

Add SdkDownloader instance as a member of AndroidSettingsWidget.

Change-Id: Ieabc9c6ddecbe63586f750b26bcf4ca990caee26
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-18 10:53:15 +00:00
Assam Boudjelthia
76c2208bac Android: Add windows usb drivers to SDK essentials
Add "extras;google;usb_driver" to essentials packages to be installed
automatically. So, change would also account for platform specific
packages.

Change-Id: I9b452b9ee30be9f606ca77fcd79712d66fab84e7
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2020-03-18 10:50:28 +00:00
Eike Ziller
9e0009803c Fix lupdate issues
Change-Id: I26f08ae82354c178f6d26f9138796328b50bfba8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-03-18 10:45:15 +00:00
Robert Loehning
d1daf6a542 Android: Add missing space
Change-Id: I061c91c9f48579179591dc912ab3bd48c13af0b0
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-03-18 10:30:05 +00:00
Christian Stenger
4fefbbcb66 QbsPM: Pass enabled information to code model
If a project part is not enabled let the code model know
about it as others may refer to this information as well.
Fixes an issue with the AutoTest plugin when it tries
to run a test for which no build targets will be generated
at all as it is disabled by some condition.

Change-Id: I342e8dde0a171084894ec59fdb462d7e9526c8db
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-18 09:28:41 +00:00
Christian Stenger
5a562bd9b1 AutoTest: Fix possible crash
Re-triggering runOrDebugTests() should be done
only once to avoid the test runner interfering
itself and crashing QC.
Amends 0f60f120d2.

Change-Id: I49f666f2c96730729ef54d8d8781d4058b3e0cca
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-18 09:08:32 +00:00
Knud Dollereder
5b000d17cb QmlDesigner: Add the ability to modify the animation range
Add the ability to modify the animation range from the curve editor

Fix a synchronization issue between timeline and curve editor when
the animation contains pinned curves

Change-Id: I89dda234063259f41d662749d696f5fc8a04f988
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
v4.12.0-beta2
2020-03-17 17:19:14 +00:00
Tobias Hunger
0fe2b961b9 CppEditor: Quieten moc warnings during CMake build
Change-Id: If8791e85d519b4a20ffa7c9d9302000d07ea605e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-03-17 14:32:13 +00:00
Christian Stenger
0f60f120d2 AutoTest: Handle async updates of executable information
When opening or creating a project for the first time the
executable path of the application targets may be empty
until the build system has updated this after the first
successful build.
This update happens asynchronously, so we might need to
postpone the test execution a bit and wait for the
respective update.

Change-Id: I63b5c45f6ecb194020ea36bbb5c9486a4dcc004c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-17 14:32:02 +00:00
Tobias Hunger
bccf50827c ModelEditor: Quieten warning from moc during CMake build
Change-Id: I0c777421487cac6022de651cc15e54704b796c3e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-03-17 14:31:58 +00:00
Tobias Hunger
46138a939f QML2Puppet: Quieten CMake build when no Quick3D was found
Each of the files added by Quick3D is wrapped in an ifdef, so
that moc sees empty files and warns about them.

Change-Id: I565eab6cbc33bd0d7eb2be681d274c092a7cbaed
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-03-17 14:31:17 +00:00
Richard Weickelt
216de34207 Update qbs submodule to HEAD of the 1.16 branch
Change-Id: I4a8621d466893715a3117f02bcf0368d6c5bc6de
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-17 14:00:54 +00:00
hjk
203597eceb RemoteLinux: Declare step id constants publicly
... so the steps can be referred to by Id only in some places in
Qdb (and Qnx later), thus weakening the hard compile-time dependencies
between the plugins.

Change-Id: Ia3000b5044a8d6eb29a424a05bccb88a4c6126ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-17 13:46:08 +00:00
Assam Boudjelthia
6bcd3cc4ad Android: AVD manager move "Start" button up in the layout
The start button being in the middle looks weird and not desired
from a UX perspective.

Change-Id: I524f61a8963aa7d81f50181150a2af3b94acfacf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-17 10:05:23 +00:00
Eike Ziller
ed5e6a4999 Add some additional shortcuts for actions
Add Cmd+Shift+- for decreasing font size on macOS.
Do not add Cmd+= for increasing size, because it conflicts with the
existing shortcut for "Replace and Find Next".

Sprinkle some Backspace shortcuts in addition to Delete for removing
items. There are (laptop) keyboards that either do not have a designated
Delete key (requiring Fn+Backspace) or where the Delete key is not
conveniently located/sized, and there is no benefit in making the
distinction in that case anyhow.

Fixes: QTCREATORBUG-706
Fixes: QTCREATORBUG-13733
Change-Id: I06274a9810b82800ec6158a883c95d2a7ae2465e
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-17 09:39:37 +00:00
Christian Kandeler
0ff5bf75e1 Move some code from OutputWindow to OutputFormatter
That's where it belongs: The logic there is applicable to all output
formatters, not just those used via an output window.

Change-Id: Idf4ca8d22631ca96feb97553f28724c0275e0bf8
Reviewed-by: hjk <hjk@qt.io>
2020-03-17 09:39:12 +00:00
Leena Miettinen
63fc9d8159 UVSC: Fix UI text according to the guidelines
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: Ibbe4e6e7fd147bf6cb2b4d478a4b938e62d06075
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2020-03-17 09:36:13 +00:00
Leena Miettinen
5f775e9edc Bare Metal: Fix UI text to follow guidelines
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: I1e4dbe8aae5c805ef21f49fb519e7e200a54302d
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2020-03-17 09:35:55 +00:00
Alessandro Portale
550e4bb98c McuSupport: Prepare for dynamic targets detection of SDK
Move around some code to keep the following changes understandable.

Task-number: UL-2012
Change-Id: Ib05699b893d2f7d1cf846507adb198b893187954
Reviewed-by: hjk <hjk@qt.io>
2020-03-17 09:29:21 +00:00
Christian Stenger
f88789081d Utils: Fix missing include
Amends 2307c61c95.

Change-Id: I7297d5a94b9ab6faaf47fcc642f883546cf8f164
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-17 08:55:48 +00:00
Eike Ziller
31cc9b8e69 Make it possible to set more than one shortcut per action
Multiple shortcuts per action make it possible to configure friendlier
behavior.
E.g. on macOS decreasing/increasing font sizes, and deleting elements
usually have two shortcuts each. But also custom configurations that
assign a different key to a common function without removing the default
can be useful.

In this patch the functionality is still pretty much hidden from the
user, even though there is a "secret" way to enter such multiple
shortcuts in the settings dialog, by separating shortcuts with
" | ".

Task-number: QTCREATORBUG-72
Change-Id: I16bec0a71aaf4abf50335b0fd7da620c73b31777
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-17 08:55:10 +00:00
Eike Ziller
2307c61c95 Factor an overlay widget out of progress indicator
The principle of having a widget on top of all other children of the
same parent, for the purpose of painting an overlay, is generic.

Change-Id: I6d3ee89cc51354988fedcc40340bb45a065db607
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-17 08:39:22 +00:00
Leena Miettinen
e0d38ab353 Doc: Update instructions for creating plugins
Fixes: QTCREATORBUG-23701
Change-Id: I8e5569512eee87b18ddaeedde87122015e69b821
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-03-17 08:34:24 +00:00
Assam Boudjelthia
c03cc13bba Android: fix OpenSSL download minor wrong condition
Silent bool should be reversed.

Change-Id: I2b8506eb7af95dc51fab8e911c548dac766ce090
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-17 06:33:32 +00:00
Denis Shienkov
3ad7ef4796 QbsPM: Fix wrong {GCC|Clang} compiler name and prefix handling
When the GCC or Clang compiler name ends with the version sub-string
(f.e. arm-none-eabi-gcc-8.2.1.exe), this leads to the wrong cCompilerName
detection, that causes the project parsing errors and disables the project:

  The following properties are not set. Set them in your profile or product:
  cpp.compilerIncludePaths
  cpp.compilerFrameworkPaths
  cpp.compilerLibraryPaths

  Product 'xyz' had errors and was disabled.

Now we return a proper prefix (e.g. arm-none-eabi-) and cCompilerName
with a version (e.g. 'gcc-8.2.1.exe')

Change-Id: I5dd42a343a0982326ed0f23b821e5016b8df39f1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-03-16 18:37:18 +00:00
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