Commit Graph

67787 Commits

Author SHA1 Message Date
Ivan Komissarov
9cee211945 Update Qbs submodule
Change-Id: I6f6de1f368cfc6cb94d9503ab9554efc19ae0c97
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-20 16:05:13 +00:00
Thomas Hartmann
98656b5e61 QmlDesigner: Provide Object3DPane
If the QtQuick3D import becomes before the QtQuick import,
then QtObject is not recognized as a prototype of the QtQuick3D types.

Workaround: provide a pane for Object3D.

Task-number: QDS-2648
Change-Id: I337a30d09233101a8e7b00cc2d145d8211933571
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-20 15:45:09 +00:00
hjk
bedf7d74a4 Mcu: Extend workaround for missing JSON file for Desktop target to Linux
Amends 08fe165ab586e6.

Change-Id: I3c3d205f083a3b59ac0490bf7ff22f12fb613b62
Reviewed-by: Jacek Nijaki <jacek.nijaki@siili.com>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-08-20 15:03:37 +00:00
hjk
c6818c62f1 PerfProfiler: Some compile fixes with Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I9d3260034051dd15e7d5892e3300f5f719bdf5ca
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2020-08-20 13:34:33 +00:00
Leena Miettinen
2e0e0df290 Doc: Add info about Merge Tool menu item visibility
Tools > Git > Git Tools > Merge Tool is visible only when
the user has a merge conflict to resolve.

Change-Id: I1c08dae329152726139d075b03a98875b789e154
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-08-20 13:29:31 +00:00
Leena Miettinen
e15d457c18 Doc: Describe starting git bash
Change-Id: If8098f89240f6fdf655adce31734ca847bfec14b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-08-20 13:25:55 +00:00
Leena Miettinen
ed74779a10 Doc: Update info about Clang Tools options
Change-Id: Id967798d3f1a0fc52c1f2c413e953d7324582e7b
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-20 13:25:35 +00:00
Thomas Hartmann
02c9f0384c QmlProject: Fix crash
Change-Id: I6b83b6c05b1c94f62c868329ea118d638d9928b6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-20 12:12:46 +00:00
hjk
0cdd07e06e AutoTest: Fix compilation with Qt6
Task-number: QTCREATORBUG-24098
Change-Id: I40b51e02fbb90b059d3cad16a57b70e463e6465d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-20 11:24:44 +00:00
Robert Loehning
f29d73115d Squish: Avoid focus problems after cloning
The dialog shows a kind of completion popup. After that, the Locator
does not get proper focus anymore. Clicking into the dialog closes
the completion popup and seems to fix the focus problem.

Change-Id: I0ae901cc4f23b66d2c3db2c96109be79a0ded52c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-20 10:44:12 +00:00
Christian Kandeler
86728b84f1 CppEditor: Properly handle multiple inheritance
... in "Insert Virtual Functions" quickfix.

Fixes: QTCREATORBUG-12223
Change-Id: I7dad7c219017a8c7b10b08190e35d1899ca5dfe6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-20 10:34:53 +00:00
hjk
919dc86c37 RemoteLinux: Compile fix with Qt6
QMap::unite() is gone, the replacement insert() came late, so ask
the preprocessor for help.

Task-number: QTCREATORBUG-24098
Change-Id: I2f596f9a998fa795fe0df378a39c4f1267f4e6e7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-20 10:23:26 +00:00
Henning Gruendl
2fe5b9f9b3 QmlDesigner: Add Connections specifics
Change-Id: I161f05c82f8c4114294a9c2609e4e3b50081db61
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-20 10:16:41 +00:00
Henning Gruendl
15296cecc9 QmlDesigner: Fix property editor template layout
Change-Id: Icc4dd3e1e0daabc98dbfd893e0511a4ac6d07b13
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-20 10:16:13 +00:00
Henning Gruendl
5946ff96f8 QmlDesigner: Add State specifics
Change-Id: Ia80688dc056eab190e80344ef4414d1be247c4e5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-20 10:15:35 +00:00
Michael Winkelmann
44a3c092a0 QmlPuppet: Refactor ChangeIdsCommand
Change-Id: I75de863121b66a5050226dd5c8914229cb1af608
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-20 09:33:30 +00:00
Michael Winkelmann
d39a6f656f QmlPuppet: Refactor ChangeFileUrlCommand
Change-Id: I900f530109b6cdbb22d8138094443b48834d16cb
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-20 09:33:13 +00:00
Michael Winkelmann
95aa7f42de QmlPuppet: Refactor ChangeBindingsCommand
Change-Id: Id3020a73f59a1adfd25066a37d083d923e77956b
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-20 09:33:04 +00:00
Michael Winkelmann
098d32b370 QmlPuppet: Refactor ChangeLanguageCommand
Change-Id: I31813d13da753ba742488943afea673540b3a3fa
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-20 09:32:48 +00:00
Robert Loehning
a3ddeb7399 Squish: Make workaround in tst_CSUP03 permanent
The bug is fixed in 4.14.

Change-Id: I7fe69f98d69de494f886bca3f854b7be626998e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-20 09:29:18 +00:00
hjk
5d820b79e6 Debugger: Compile fix for Qt6
QMap and QMultiMap are distinct types in Qt6

Task-number: QTCREATORBUG-24098
Change-Id: I959012739231fb3b184dcc13cebd119c83059a99
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-20 09:27:55 +00:00
Robert Loehning
d305c4d6f4 Squish: Modernize failing test from tst_CSUP01
Change-Id: I5755a0265d2810a2a5929657ac455aa380a417e6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-20 09:12:58 +00:00
Christian Stenger
76c872f633 GlslEditor: Display tool tips for errors and warnings
Change-Id: Id5f6e555599e479a83cc565966653b9e44b85772
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-20 09:07:53 +00:00
Christian Stenger
52eea4c021 PE: Make TextDisplay a pure text display
Remove the pixmap part as pixmap and label text are
mutually exclusive and currently not used.
Beside this we must not call setVisible() before adding
the label to an already existing widget or layout or it
will be temporarily pop up as separate widget.
Amends 9e54e1776e.

Change-Id: Iaa57bfd1ca105d7360eaa360d68dbde38eaf0aeb
Reviewed-by: hjk <hjk@qt.io>
2020-08-20 09:07:42 +00:00
David Schulz
0c2909a24e Editor: update autogenerated KSyntaxHighlighting sources
Change-Id: I77827db6889335250699f942a4cdaf77a5a95337
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-20 08:56:41 +00:00
hjk
7ebd7a2213 Nim: Fix use of non-default arguments for Nimble build step
Amends 200d81d3, which mis-placed the call for argument setup,
effectively resetting it to default on each run.

Change-Id: I4b4f3ab90570d14e7ffc41346eb4f06241eb4f4c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-20 08:33:31 +00:00
Christian Kandeler
ddf7f5f232 CppTools: Do not indent within string literals
Multi-line strings must be kept as the user wrote them.

Fixes: QTCREATORBUG-20180
Change-Id: I141eff52b55d31215e6f5c6c5a0e026689db877a
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-20 08:10:22 +00:00
David Schulz
158fd92558 SCXML: fix magnifier not hiding
Fixes: QTCREATORBUG-24463
Change-Id: I835550e32467992ea7ad2555c546d810e6e0bbad
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-20 06:20:40 +00:00
Cristian Adam
d6c3846ab1 CMake Build: Add Google Testing 1.10.x as submodule
Fixes: QTCREATORBUG-24510
Change-Id: I763d72524f2e581671e18bcd9cda42d5bf7bccdf
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-08-19 15:50:37 +00:00
Christian Stenger
790757a8e8 AutoTest: Fix persisting of check states
Persistent settings cannot handle QVariantHash and when
reading the check state the meta type system seems to have
the need to have used the check state already before,
otherwise it will fail to convert until it uses it.
This happened e.g. when re-opening a project that had
former check states stored inside the project settings
directly from the Welcome page after starting QC.
Amends df49d6e40d.

Change-Id: Id2b85373c151efb5890fe5fb7392bdbc11adda50
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-19 13:55:29 +00:00
Christian Stenger
abffbe3806 Squish: Fix expectations
Added observation functionality for a temporary move
of the URL.
Let the test fail if the move becomes permanent.

Change-Id: I7989d654ea6e89ccba112b5cb640144afba40339
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-19 13:55:09 +00:00
Michael Winkelmann
a638c25252 Annotation: Add export macros
Change-Id: Ieebc2750462bc6266e11318ea96c031b2ea6ef9f
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-19 13:36:14 +00:00
hjk
eb0d2518f9 Incredibuild: Use new AbstractProcessStep convenience functions
Change-Id: Id741ed68f146bbe6473925bc6bcdaa2f330f3ea6
Reviewed-by: <nir.bar@panel-sw.co.il>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-19 13:19:48 +00:00
David Schulz
150d29a8fd TextEditor: Fix remembering highlight definition
Amends 6989c9bbea

Since the change above the filename is checked before the mimetype, so
we have to save it in the same order.

Fixes: QTCREATORBUG-24505
Change-Id: Ib974dc0f69ca56cfd6ee9e34bec238e62f800598
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-19 12:40:51 +00:00
Michael Winkelmann
dbf00e63e5 NodeInstanceView: remove white space for initializers
Change-Id: I001ade2bb44b771661996e5103a37213a779fd74
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-19 11:33:24 +00:00
Alessandro Portale
aba3ac391c Core: Fix deprecation warning regarding QTimeLine::CurveShape
Since 5.15: "Access easingCurve directly"

Change-Id: I75a9f6c898dd2829e1d2a639bd9188c4aeeccc2d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-19 10:58:03 +00:00
Eike Ziller
14caa65f14 CMake build: Stop looking for QtScript
It is no longer used.
Amends 7a3f5edfaf

Change-Id: Id76d05a303179f071cdc334dd0f1e7041b7eaa92
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-19 10:40:36 +00:00
Eike Ziller
c92999dc0d CMake build: install application icons on Linux
Fixes: QTCREATORBUG-24355
Change-Id: I221d753f96144ef60ba755d2489eed1ed91b3b36
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-19 10:40:24 +00:00
Eike Ziller
b9b2887686 CMake build: Fix copying of external tools
Fixes: QTCREATORBUG-24509
Change-Id: Ic19adf009bba326a2b9e59fe561e4021bbf21412
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-19 10:40:12 +00:00
Alessandro Portale
90f050b2a1 McuSupport: Fix warning about missing field initializers
Change-Id: I466f679a5cb583c351e0231a60cd9ce766d58f5e
Reviewed-by: hjk <hjk@qt.io>
2020-08-19 09:59:14 +00:00
Eike Ziller
98bf1a666a Fix more license headers
Fixes: QTCREATORBUG-24501
Change-Id: Ie7604f2b977f945744891b3c78e56a7818782a1d
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-08-19 08:08:38 +00:00
Leena Miettinen
ff41175e8a Doc: Move info about GDB settings to "Specifying Debugger Settings"
...in "Setting Up Debugger"

Task-number: QTCREATORBUG-24500
Change-Id: Ibf5a35b642f9b372d9a48d5e1095678b81b246f7
Reviewed-by: hjk <hjk@qt.io>
2020-08-19 07:49:43 +00:00
Leena Miettinen
0b19885bb1 Doc: Describe the "Override SysRoot" option for launching debugger
Task-number: QTCREATORBUG-24500
Change-Id: I26f50ee57c0a7f453a3e72e4bb27aec27d9c97ca
Reviewed-by: hjk <hjk@qt.io>
2020-08-19 07:49:14 +00:00
Christian Stenger
e9c27cca34 Utils: Fix persisting of QRect
And pass explicitly a QVariant to the writer to avoid
unexpected behavior when trying to store the geometry
of a widget.
This resulted in a warning for any session where the
user had used the debugger at least once.

Change-Id: I5cb2352ab29ff7d2a64c84ffcdf040efe6d04b94
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-08-19 07:39:43 +00:00
Christian Stenger
2ac60ac66e Core: Fix filter of variable chooser
Fixes: QTCREATORBUG-24499
Change-Id: I787fc4342556d7062a1de5e7cb52d9d48532e719
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-19 07:38:57 +00:00
hjk
b0fb06b8ef iOS: Use a constant from iosconstant.h as deploy step id
Not really a big win here, but in line with what most others do.

Change-Id: I19f100084c8ca4cc7d0de97125efdc519bdfc972
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-19 07:07:43 +00:00
Eike Ziller
058f1e6918 Fix some license headers
Missing the GPL part.

Fixes: QTCREATORBUG-24501
Change-Id: I9e8e033399c050af29927d0ee735f9bcd05345bf
Reviewed-by: hjk <hjk@qt.io>
2020-08-19 07:05:55 +00:00
Leena Miettinen
6d897b67dd Doc: Update info about CMake support
Fixes: QTCREATORBUG-24497
Change-Id: I524907e461ba91b18a6741690bef9ed27a40fb5f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-08-19 06:52:51 +00:00
hjk
fb262ce24d ProjectExplorer: Streamline build step creation via menu
Change-Id: I801031d5a3d3ad8d8e5cf61766ca4e9791d7a96c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-18 17:03:59 +00:00
Jacek Nijaki
4f595be64a McuSupport: Read RGL configuration from json
Previously whole SDK configuration for Renesas RH850 was hard coded.
Now configuration is read form the json file - same as for the other
SDKs. This changes adds new boardSdk params:
- name: sets the name for the SDK. If not set existing logic for
        generating name as "MCU SDK()" is used
- defaultPath: path where to look for the SDK if env variable is not set

Change-Id: Ia4b92c95bdc3302309cea4b935afbdd2e0bcadbe
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-08-18 14:35:28 +00:00