Commit Graph

61529 Commits

Author SHA1 Message Date
hjk
6cb17fcae9 ProjectExplorer: RunSettingsWidget code cosmetics
Namespaces, #includes, unused bits.

Change-Id: I13704948204a13d91cff1a48b8f3ed189ea0bf44
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-08-01 10:59:19 +00:00
hjk
ab665da16f Debugger: File file order in CMakeLists.txt
Amends a249694d.

Change-Id: Ie607a57d44dc32686fb74dc420f20c84fb4f28db
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2019-08-01 10:40:19 +00:00
Eike Ziller
e5543eaebf Merge remote-tracking branch 'origin/4.10'
Change-Id: Id9cab641788f93cda9a81da9f156614b91d87b2a
2019-08-01 11:58:56 +02:00
Eike Ziller
100e21c0d4 CMake build: Add PUBLIC_DEFINES to extend_qtc_target/add_qtc_plugin
Change-Id: I65d5af13f697ed7dcf4d3584e3b4cd776dcdf6c0
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-08-01 09:50:19 +00:00
hjk
a249694d93 Debugger: Fix cmake build
Change-Id: I9aa765aa69a5dfe104006b7385e6953e2611270d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2019-08-01 09:19:06 +00:00
Denis Shienkov
d855263869 Debugger: Fix start/stop bits order in peripheral register field tooltip
Usually this order should be displayed as [to..from] instead of [from..to].

Change-Id: I4a309eedc104b10ac89a48beacb0e187af5c1899
Reviewed-by: hjk <hjk@qt.io>
2019-08-01 08:26:20 +00:00
Nikolai Kosjar
73095f5506 Debugger: Fix qbs build
Change-Id: I6da8e347b39a9a9f6387a8308d0b82489de68377
Reviewed-by: hjk <hjk@qt.io>
2019-08-01 08:14:32 +00:00
Nikolai Kosjar
c2d36c9387 CppEditor: Fix reference to temporary
Change-Id: I3e2d7cb046e645e03ce5da7f18c48d6ce05fc76a
Reviewed-by: hjk <hjk@qt.io>
2019-08-01 08:14:06 +00:00
Thomas Hartmann
c677703543 QmlDesigner: Explcitly set drag range for geometry properties
The default drag range is based on the minimum and maximum,
but sicne those are huge we overide the default.

Change-Id: Ibad785b475adfd92a78e6c5ff21fed2af21d637a
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
v4.10.0-rc1
2019-08-01 07:14:45 +00:00
Christian Stenger
0bd07243ed Designer: Fix crash when executing plugin unit tests
Broke with e3b1106afa.

Change-Id: Ifc35bfa1a4e0985427ea60f49609ff0fc3528a4d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-08-01 06:20:12 +00:00
Denis Shienkov
239c82bfb0 Debugger: Add peripheral registers description file support
This feature is useful for the bare-metal programming. It allows
to view the peripheral registers of the debugged device using
the GDB.

An information about the peripheral registers for a concrete
device contains in a special SVD file. A format of this file
described e.g. here:

* https://www.keil.com/pack/doc/CMSIS/SVD/html/svd_Format_pg.html

This feature supported only for ARM devices, and an appropriate
SVD files can be found in the Internet, also this files provides
by KEIL or IAR EW IDE's.

A use case in QtC is that the user should to choose desired SVD
file and set its path to the bare-metal device configuration widget.
After this, the user can enable the "Peripheral Registers" view,
choose a desired register group and to see a peripheral register
values.

Currently the following basic features are implemented:

* Choosing SVD file for a target bare-metal device.
* Choosing any peripheral register group, which is available for
  this device.
* Seeing the info about the each peripheral register and its fields.
* Seeing the value for the each peripheral register and its fields.
* Changing the value for the each peripheral register and its fields
  (if it is allowed by access for a concrete register or field).
* Changing the format of the values (hexadecimal, decimal, octal,
  binary).

Fixes: QTCREATORBUG-18729
Change-Id: I3c38ea50ccd2e128746458f9b918095b4c2d644a
Reviewed-by: hjk <hjk@qt.io>
2019-07-31 19:46:29 +00:00
hjk
25a3c93cfe ProjectExplorer: Remove BuildStepsPage class
It's a widget containing a single widget with zero margin.

Use the inner BuildStepListWidget directly.

Change-Id: Ib2e6d63d4dbc570f45e287b216e0a9cfd5c5b8a1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-07-31 15:30:14 +00:00
Christian Kandeler
a666be04f2 QmakeProjectManager: List .ts files in the project tree
...without the user having to add them to DISTFILES or OTHER_FILES in
addition to TRANSLATIONS.

Task-number: QTCREATORBUG-7453
Change-Id: Ic9621e66079a52f22272c945b92d183eec852f68
Reviewed-by: hjk <hjk@qt.io>
2019-07-31 15:23:02 +00:00
hjk
ad99e150cc GenericProject: Normalize make step setup
We have only one id for the steps, so short of coming up with some
fancy upgrade mechanism, stick to the one kind of step, but also
use only one factory, and do the switch in the step constructor
based on the nature of the parent buildsteplist.

Change-Id: I8fcc599682840d61e4a7f8b6fb7b792aafdd8766
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-07-31 15:20:30 +00:00
hjk
0d6468a8af ProjectExplorer: Don't remove build configuration
... before announcing it and trying to remove it a second time.

Change-Id: I0f0238974fa317051d99b8f096cfc472e4f0cbe3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-07-31 15:20:06 +00:00
hjk
8e1f89aca2 ProjectExplorer: Base BuildStepList on QObject, not ProjectConfiguration
The only shared thing is an id, and even that's arguably even better
done by an enum, since there's a fixed set of three of them in that case.

Change-Id: Ia9da858524a5eb44eb91512ce72105249b5a9702
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-07-31 15:06:11 +00:00
hjk
b8a6f9fa52 ProjectExplorer: Adapt class docs for ProjectConfigurationModel
Change-Id: Ie3cf11b16d4f2aeeebb1cb288e46fcc73c56ba31
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-07-31 13:57:14 +00:00
Cristian Adam
12e61a9e1b CMake Build: Fix build
Change-Id: Ie066f6b4fe0f0dda5d5fdd6a734c4b8408164dd1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-07-31 13:19:36 +00:00
hjk
7dc5e13cef QmlDesigner: Fix truncation warning
Change-Id: Id655291305eeb5b8f13916bad9f14f5aa5362987
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-07-31 13:16:27 +00:00
hjk
4ffbf3e544 QmlDesigner: Removal of penultimate use of Java-style iterator
Change-Id: Ib581063db59526211d068bd365c0493e5199d941
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-07-31 12:54:37 +00:00
hjk
eb06d1f1cc ProjectExplorer: Fix crash when triggering Kit name changes
Amends 7d3091a7b9.

Change-Id: Ibb18ffef49f8b9739121dcbfa29639d5e3f6a71b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-07-31 12:39:23 +00:00
hjk
ae66f63390 Debugger: Disable QObject connection and signal display
Besides the announced change to QObject guts in a5a859e72 there has been
at least 6e0b5dadc and possibly more, so give up here.

Change-Id: I84201cef9f2a7515f082f4c3310bdc96f7a4216d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-31 12:18:02 +00:00
hjk
05ec31453c ProjectExplorer: Use function for comparison instead of global object
Cheaper.

Change-Id: Ibcaa68fd96b5ae0272a32033c5e3606e9a037bbe
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-07-31 11:44:53 +00:00
hjk
4461efdfbb ProjectExplorer: Move *ConfigurationModel ownership to target
The models hold essentially duplicated information besides the actual
configuration lists that are already in the target and are only
used in a context where the target is known and accessible.

As the models keep track of all added or removed configurations
and can be fed configurations of the right types only, the need
to filter is gone.

Change-Id: Iec2c6879223893297c71e7632310ac526b704237
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-07-31 11:36:55 +00:00
hjk
7d3091a7b9 ProjectExplorer: Remove ProjectConfiguration base from Target
Targets are different from {Run,Build,Deployment}Configurations,
both regarding the level in the ProjectExplorer hierarchy, and
also by the set of supported operations (e.g. aspects).

Change-Id: Ia8490e2280a9ecc518395c5e48ce2fd5d6d58fd2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-07-31 11:18:16 +00:00
Robert Loehning
5d3010a722 Squish: Use parameters in another call to mouseClick(...)
Reverts e8727fcae2 for this line.

Change-Id: I98e789ef3e09b3d33e53ced23177795e1e226a1e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-31 11:05:30 +00:00
hjk
dde9401927 QmlDesigner: Fix deprecation warnings
Change-Id: Icebf96e8f1cfc6588c7db844da47e3ac7159e056
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-07-31 10:50:53 +00:00
hjk
8eeeaead3d QmlDesigner: Avoid one use of java-style iterators
Also fix typo and use Utils::filtered instead of creating a full copy
and removing unwanted items one-by-one.

Change-Id: Ibcdd4776cdf26ab1da5564cca0b99be83b208de2
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2019-07-31 10:47:26 +00:00
Thomas Hartmann
0f3c8a3c7b QmlDesigner: Fix custom qml2puppet build
The build of a custom qml2puppet was failing, because
of utils/algorithm.h missing.
We should minimize Qt Creator dependencies in the puppet.

Change-Id: Iba8dd1a3979dbeeb1bfa860b50ba586bea20c7a7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-07-31 10:38:28 +00:00
Eike Ziller
c6b9f40615 Fix missing built-in header paths for iOS
In cc9d246b02 we started passing "-target"
to Clang when retrieving built-in header paths, but Clang doesn't like
that for iOS targets if we do not also pass the target architecture.

Fixes: QTCREATORBUG-22784
Change-Id: I007bba8ff14d7f303d84db2c803165ba789a5531
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-07-31 08:52:04 +00:00
hjk
be67ee75c5 Debugger: Fix QStandardItem dumper for Qt >= 5.9
Change-Id: Ib0dab191705982cf92d9599b8e627b41f0e187cc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-31 08:10:21 +00:00
hjk
47cd385536 QmlProjectManager: Remove warnings in file format test
Change-Id: I6c37f7da544c8e568ca33ecd4573cddaba173e04
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-31 08:06:59 +00:00
Christian Stenger
3163ed4feb QmlJSTools: Fix compile
Needed because of conflicting patches went in
nearly at the same time.

Change-Id: I042637438d1b4e412ae39bc2e8bc5e1aa24527dc
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2019-07-31 08:05:04 +00:00
hjk
f4f86078a5 QmlPuppet: Code cosmetics
Fix various warnings

Change-Id: I50e0bac1eade188e2aafdc38f7507138732822d0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-31 08:03:18 +00:00
hjk
a460fa3152 Utils: Register CommandLine
Needed e.g. in VCS support.

Change-Id: I3a9d64526bc0bf60a77ab154408dfec94cc6ba75
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-07-31 07:58:42 +00:00
hjk
b2daf07573 Debugger: Fix QFileDumper
Some QRingBuffer member got removed in 8f92baf5c9.

Change-Id: Ie0066db3b61bff25751a4886cb4b584cc4db49bf
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-31 07:28:02 +00:00
Andre Hartmann
2ec58eac25 OutputWindow: Fix freeze when zooming out very far
Task-number: QTCREATORBUG-22721
Change-Id: I5a3bc8d1aa677614bd7fdc5e5094b589721e378d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-07-31 07:20:25 +00:00
Eike Ziller
2d402bf7fe Update change log for 4.10
Change-Id: Id171e50d7fe92a354614e3718c675c64114a292e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-07-31 07:20:05 +00:00
The Qt Project
25c7d7884c Merge "Merge remote-tracking branch 'origin/4.10'" 2019-07-31 07:19:30 +00:00
Alessandro Portale
d4cf962996 Utils: Add an "online" icon
..and use it in the Help plugin to open online help.

Change-Id: Ic84c63257a08b3c2ac76bedc0db04f297f695291
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qbc.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-07-31 07:07:26 +00:00
Andre Hartmann
1f82f86167 QmljsFunctionFilter: Simplify priority handling
Change-Id: Ib3cb7f597256a3d19cc6cab3a2efa3961ac0c478
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-07-31 07:02:09 +00:00
Andre Hartmann
56948e75d8 CppLocatorFilter: Simplify priority handling
Change-Id: I612e0cc5e56a50bd6830ae2f25291aaed571ae67
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-07-31 06:32:03 +00:00
Eike Ziller
7de82409fc Merge remote-tracking branch 'origin/4.10'
Change-Id: I7a7bc552e09de1fbee98402c97e3a35f0e2c952a
2019-07-31 08:27:20 +02:00
Tobias Hunger
86c4416af6 CMake: Handle environment changes in cmake better
Handle environment changes in cmake better.

Server-mode will trigger an reader-change when the environment changes.
This has not been considered so far and a reader-change triggered by
an environment change was considered an error (and ignored).

Change-Id: I2d0baadbcfc86e04348c75d8e5997817bdc233a5
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-07-30 15:38:19 +00:00
Tobias Hunger
f9c246b26e CMake: Request filesystem scan when cmake files change
The typical use case is to add header/source file and then update
the CMakeLists.txt file to add the source.

Request a filesystem scan when a cmakefile changes to pick up the
header file when the source file is added.

Task-number: QTCREATORBUG-22674
Change-Id: Ifbb1ba37dd46967215f51db2c6ad92af669df585
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-07-30 15:38:04 +00:00
Tobias Hunger
16fe5fe109 CMake: Simplify reparsing logic
Do not overload the "new reader" logic with the logic for "no CMakeCache.txt"
file.

This makes it a bit simpler to reason about the different conditions when the
options are applied.

Note that "no CMakeCache.txt" is handled later anyway by adding the
"REPARSE_FORCE_CMAKE_RUN" flag.

Change-Id: Icc9455152053911cc839a19c76d3c0e44fc76fcf
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-07-30 15:37:53 +00:00
Robert Loehning
e425d88b6b Squish: Update clang detection in tst_default_settings
Change-Id: Ia1e0332253a309eae9579fff5cae2659a6089c50
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-30 13:29:05 +00:00
Robert Loehning
4cfcdc65a5 Squish: Use parameters in another call to mouseClick(...)
Reverts e8727fcae2 for this line.

Change-Id: I6ac752985fb9bcb66a38d7f97d8cc8dc33da4189
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-07-30 13:28:43 +00:00
Thomas Hartmann
c3e3d40f90 QmlDesigner: Extend test
Change-Id: I3850814303bc791934044f10a955cfcbc78e76ef
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-07-30 13:10:02 +00:00
Thomas Hartmann
3363e42024 QmlDesigner: Fix changing of dynamic properties
We have to use lastSourceLocation().end() instead of offset.
SourceLocation was refactored and this was forgotten.

Change-Id: I6a43b42b48e03b6b289173a85f5a4a98b2a44628
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-07-30 13:09:44 +00:00