Commit Graph

67787 Commits

Author SHA1 Message Date
Thomas Hartmann
72cd449f80 QmlDesigner: Support forceNonDefaultProperty in createQmlObjectNode()
Change-Id: I991af0304851c227c7e2911e3fd90a4de2788786
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 05:43:10 +00:00
Thomas Hartmann
f4f1c2b30a QmlDesigner: Allow defining default colors in FlowView
Change-Id: Ib4e2b6eb7283044ecbab5ced839a6d4d35b284c1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 05:40:54 +00:00
Thomas Hartmann
bfb86a68fd QmlDesigner: Adjust DragTool for FlowMode
If editing flows all items are added to the root node.

Change-Id: Id1ec5810947c08e8b46d753df49e0b05f919061b
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-21 05:37:01 +00:00
Christian Stenger
f9ff63e340 Squish: Avoid false positive in tst_CSUP01
If intrinsic headers are globally present the proposal
widget might also suggest _mm_undefined_si128 or
_mm256_undefined_si256 when typing 'unsi'.
Be slightly more specific and therefore exclude these.

Change-Id: Ie988ce7a1312fb31803a6e9fa885e10a51229d09
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2020-04-20 18:47:52 +00:00
Thomas Hartmann
cfb64f00d6 QmlDesigner: Add support for more AuxiliaryData in property editor
Change-Id: If5e5b7b52da991f6aa488715d99c36f4499696d8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-20 17:10:02 +00:00
Thomas Hartmann
d223da63e2 QmlDesigner: Reduce priority for editing anotations
Editing annotations is possible using the context menu.
We can keep it as the default on double click, but it should have
lower priority than other tools.

Change-Id: I6cd51074460c5f32030e9d799abda4a198036409
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-20 17:09:22 +00:00
Thomas Hartmann
eb82d396e3 QmlDesigner: Add ModelNodeToArray() to BindingProperty
Change-Id: I98761ee607882f24bff89c3745af2f6f35587c1d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-20 17:08:47 +00:00
Henning Gruendl
a35a9e72d9 QmlDesigner: Extend icon font support
* Use ADS::IconProvider to make use of font icons
* Add support for IconProvider in FloatingWidgetTitlebar
* Add support for named font icon entities in QmlDesigner::Theme
* Add level of indirection to Constants.qml to be able to parse it
  from inside C++
* Add color and HighDPI support in stylehelper
* Update RichTextEditor
* Update icon font and related constants

Task-number: QDS-1913
Change-Id: I7212f4dfe480dbb340fd042f59c69b8f5ca7a8e4
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-20 16:21:46 +00:00
Mahmoud Badri
2f99a87a3f QmlDesigner: Fix material texture not updating after image DnD
Image path from project root is used instead of image name to make it
work when the image is inside a folder.

Task-number: QDS-1956
Change-Id: Ia5e10d7bf893902eaea6551e3ec6daafd7977a83
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-20 15:16:16 +00:00
Thomas Hartmann
98ad7f96bb QmlDesigner: Add extra check
The node might be also invalid.

Change-Id: I3f9ecd63f178f15c495f6b60d36b02cb54b5d254
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-20 14:46:38 +00:00
Thomas Hartmann
022b2b47e9 QmlDesigner: Remove check
This is taken care of in update already.
Empty section are not shown.

Change-Id: I48763c42bb7d1b39e36b87be35e48c558a512c77
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-20 14:44:17 +00:00
Thomas Hartmann
f94c8e1143 QmlDesigner: Show FlowWildcard and FlowDecision in item library
We want to show those in the flow mode.

Change-Id: Ifc997102f37495d759355adcefb98b1febd11d53
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-20 14:43:59 +00:00
Tobias Hunger
82a7adf624 CMake: Remove dead member from CMakeBuildSystem
Change-Id: Iffdc3d67c2309c1cdc427b383c023d8c98eac037
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-04-20 13:36:49 +00:00
Tobias Hunger
43895c87a2 CMake: Fix WS only
Change-Id: I2ab4d5e3998ee550cdc00e27a314ae3109c8225b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-04-20 13:20:59 +00:00
Eike Ziller
8ec6872226 Update changes file for 4.12.0
Change-Id: I22fefcfd6270d7e003c83a82edfc5d9084d169c8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-20 13:16:19 +00:00
Eike Ziller
a45d3e12a4 CMake build: Add public include for QmlDesigner plugins
QmlDesigner plugins need this include path, no need to repeat that over
and over again. It also makes it easier to support out-of-repository
plugins.

Task-number: QTCREATORBUG-23778
Change-Id: I33e959fe56815e59a5e8e0db0bbdff016411b067
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-04-20 12:05:58 +00:00
Leena Miettinen
faa8547b12 Doc: Fix links to QtAndroid functions
Add a dependency to the Qt Android Extras module to the
doc configuration file to enable linking to the module.

Change-Id: I69271554f78a0d73fc44032f9310e9670b06961e
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-04-20 11:56:50 +00:00
Leena Miettinen
b7e5362e8f Doc: Update info about run settings
Task-number: QTCREATORBUG-23364
Change-Id: I5753db6a82e62a371b9d5fb89c01d3ec87676ad3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-20 11:06:29 +00:00
Tobias Hunger
5350288e45 CMake: Fix includes all over the CMake plugin
Keep internals internal, remove some unnecessary includes, add
some that should have been there.

This reduces the number of files that get rebuild when working
on CMake internals from over 1000 to about 200.

This patch also moves some code around that ended up being
in the wrong file.

Change-Id: Icd7366ac760dc85031040720418fbb16336dce9b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-20 10:05:24 +00:00
Tobias Hunger
d0e0ffd2d2 Revert "CMake: Pass on extra files to code model"
This reverts commit 4d3eea6884.

Reason for revert: QTCREATORBUG-23876

Change-Id: I1b438d13cbdf64870e7cc9f7432665d773f58369
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-20 10:05:08 +00:00
Jochen Seemann
9f981e7e23 AutoTest: Wizard: Add Support for Catch2
Done-with: Christian Stenger <christian.stenger@qt.io>
Change-Id: Idc59cf962e54845746a645efb5e931502deae38e
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-20 08:43:45 +00:00
Christian Stenger
ae3bb43dd1 AutoTest: Support registering functions as catch test cases
Task-number: QTCREATORBUG-19740
Change-Id: I60a59d3902e1202d4cf18635bae3ef31806b0aac
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-20 08:43:19 +00:00
Christian Stenger
4e0fa78752 AutoTest: Pull catch tree nodes one level up
This patch makes test cases now match the TestCase node so that possible
additional sections can be functions instead of test data.
Mis-use the TestSuite for the file node that is used to additionally
group the items. The file node is kept - for now - as it seems rather
often that test case names get pretty long names.

Change-Id: I364fc40d1de6a22b6f170b3001f37393b64680aa
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-20 08:43:03 +00:00
Christian Stenger
df830ccf08 AutoTest: Filter interfering arguments for Catch tests
Some of the possible options usable with a Catch test executable
may interfere with what is expected on the AutoTest plugin side.
Other options will be provided by settings that will be added
in a follow-up.

Change-Id: I9613c28c2e0fac8af27c5e8293921933bd570337
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-20 08:42:25 +00:00
Eike Ziller
8383ca777f Add some documentation on action manager and commands
Change-Id: I03d8292120b30973155248471b12d1627536fb39
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-20 08:12:34 +00:00
hjk
458ff1e967 Android: Persist ABI selection for multi-arch builds
Change-Id: I67fe60bc5a5bd0c086d36368fec4369e4744dab8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-04-20 07:43:52 +00:00
Eike Ziller
ad9e4cd2f6 Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/android/androidconfigurations.cpp
	src/plugins/qtsupport/qtoptionspage.cpp

Change-Id: I91ee3e771ab630ac3a54be53ac4be6d3c1c46950
2020-04-20 08:40:54 +02:00
Eike Ziller
9e84724c53 Fix "Link with Qt" for Qt offline installers
The Qt offline installers do not necessarily write a QtCreator.ini.
Check for qtversion.xml as well.

Change-Id: Ib7fd9f39444a8eec817646dd495fdc94696906e8
Reviewed-by: hjk <hjk@qt.io>
2020-04-20 06:33:55 +00:00
Assam Boudjelthia
9e057a5536 Android: add support for new SDK Tools package cmdline-tools
The newly added cmdline-tools is not used by Qt Creator.
So QC Android settings will be broken for users who have
an Android SDK installed from Android Studio, or who
updated their SDK package (i.e. tools -> cmdline-tools).

This patch fixes both of the following issues:

1- QC looks for sdkmanager tools under <SDK_ROOT>/tools/bin/sdkmanager,
and with the new SDK it's under
<SDK_ROOT>/cmdline-tools/latest/sdkmanger.

2- QC checks the version of the SDK tools and opens the
old SDK Manager for SDK tools version 25.3.0 or less.
However, since cmdline-tools is now version 1.0, it causes
QC to think this is an old version.

Fixes: QTCREATORBUG-23726
Change-Id: I7e6bbc6840d24d358f68dfa3e229799394ace950
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-04-18 16:31:36 +00:00
Christian Kandeler
98ce70480a Vcs: Fix output pane
Amends c0c2df203d.

Change-Id: I77d022f2b3a4d3cab4713d9cbd2bc66102ee58a3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-04-17 14:52:12 +00:00
Christian Stenger
ce3306ccb3 AutoTest: Do not inherit from another framework
Commit 91509727e0 had some unexpected side effect.
Amend (or replace) this one by an explicit lookup which
is still a hack, but at least safe to do.

Change-Id: I8fd2e9bdcea18d062f6fc6dd74709c12c16f2cc5
Reviewed-by: hjk <hjk@qt.io>
2020-04-17 14:11:12 +00:00
Tobias Hunger
74a07f906f CMake: Rename some constants
Rename some constants to get a bit more consistency into the
naming scheme. I am so tiered of missing a constant due to it
not having _ in the expected places!

Change-Id: Ibb5e82ea4e25ccb559352839b96c8a64394f3085
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-17 13:24:43 +00:00
BogDan Vatra
fdb0cf0f6b Update openSslPath when we change the android sdk path
Change-Id: I39bd02d4f5bba8d03d4606b0de89b50778c7aa01
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-04-17 13:04:38 +00:00
Thomas Hartmann
f671d46c1d QmlDesigner: Add extra check for invalid node
Change-Id: Id3cb9b6a2eb8230f0e3403fad30c57a67227fa5e
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-17 11:30:18 +00:00
Thomas Hartmann
f9fb5d7e88 QmlDesigner: Fix crash
Change-Id: Iaabc04e97fb7e06d462e7716be27a24471be2bd2
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-17 11:29:29 +00:00
The Qt Project
7e3afa6657 Merge "Merge remote-tracking branch 'origin/4.12'" 2020-04-17 09:45:59 +00:00
Leena Miettinen
6579505b4b Doc: Update info about build settings
Task-number: QTCREATORBUG-23364
Change-Id: I0b929771ca0d11d5ab0eaa19d99f4003783480e3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-17 08:36:08 +00:00
Christian Kandeler
c564805095 Output parsers: Make file look-up self-contained
Change-Id: Iffe104b6b52f0902f1977adeaa0fee3dc1e374a4
Reviewed-by: hjk <hjk@qt.io>
2020-04-17 08:14:14 +00:00
David Schulz
1eacbc98a8 Debugger: add dumper for Utils::Environment
Change-Id: I2e80447b9b9690376a6d789c8b18d33cca22f4ab
Reviewed-by: hjk <hjk@qt.io>
2020-04-17 07:20:45 +00:00
Christian Stenger
91509727e0 AutoTest: Fix Qt Quick Test execution
Qt Quick Tests share their settings with Qt Tests and
have none on their own.
Make the separate handled framework of Qt Quick Test
derive from Qt Test framework to share the settings.
Regression introduced with 2c79196ab5.

Change-Id: I9934b0357365e2739e7a72b114df97f49da6bc50
Reviewed-by: hjk <hjk@qt.io>
2020-04-17 06:53:40 +00:00
Christian Stenger
96fe0aab8d AutoTest: Support missing Catch2 test case macros
Add support for macros defining parameterized test cases
and for test cases using a fixture.

Task-number: QTCREATORBUG-19740
Change-Id: I631009f309cb48d2657acb6e52911e052ff85c5b
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-17 06:53:26 +00:00
Eike Ziller
602d690bab Merge remote-tracking branch 'origin/4.12'
Change-Id: Ie35e9959693b6f6f78509eea5b259d6493ef87f2
2020-04-17 08:09:55 +02:00
hjk
2795292c74 Android: Remove description of ping-pong protocol
Has not been used for a while.

Change-Id: I504ca8e83c388e3b588cc27aa978d1151ccee452
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-04-16 16:36:32 +00:00
Kai Koehne
e85c074621 Doc: Remove mentioning of Madde, Blackberry support
These are arguably not relevant anymore to explicitly mention
when support got dropped more than 5 years ago.  People
can still find this information in the change log ...

Change-Id: Ib38fa40d7e0200977930bf21925d9b9b975fd8ab
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-16 14:32:27 +00:00
Tobias Hunger
5a7586fca6 QtVersion: Make sure BaseQtVersion environment is set consistently
Change-Id: Ibec67dd25de6d5b17585722b8b92e24cf272ed76
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-16 14:24:01 +00:00
Christian Kandeler
6f32538c5d ProjectExplorer: Split up the IOutputParser class
For symmetry with Utils::OutputFormatter.

Task-number: QTCREATORBUG-22665
Change-Id: I148fed69dba042ad3ef26e080829c31cd3f357fd
Reviewed-by: hjk <hjk@qt.io>
2020-04-16 10:40:33 +00:00
Richard Weickelt
7b1ff65786 Update qbs submodule to HEAD of the 1.16 branch
Change-Id: I8891681d62c107ec7e8dcf44c50f8d4e2dc4a87f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-16 10:31:25 +00:00
Robert Loehning
3837cdac2b Squish: Ignore two fails in tst_rename_file
Neither can I reproduce them without Squish, nor are
they clearly inside the scope which needs testing.

Change-Id: I25494de34cd216678913fbf04dca88c3c0126ed9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-16 10:04:59 +00:00
Tobias Hunger
4d3eea6884 CMake: Pass on extra files to code model
Pass on extra files that are not compiled according to CMake
(== headers) to the code model, so that it has the information
which build system these files are associated with.

This helps a bit with the AutoTest plugin, which wants to scan
files (incl. headers) for tests and needs information on which
build system target will build that test.

This patch fixes e.g. Google Test detection for CMake projects --
but *only* if the header files are actually listed in
CMakeLists.txt. If that is not the case, then the CMake plugin
has no way of knowing which target will build tests.

Task-number: QTCREATORBUG-23843
Change-Id: I1117c63dd052ec29a3bce6cce24c3389eedb2df7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-16 09:56:01 +00:00
Leena Miettinen
9c2393fa69 Doc: Add Python to list of supported languages
Change-Id: I01eed043b951162375d580e7b39dc5af40fec858
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-16 09:15:09 +00:00