Commit Graph

65203 Commits

Author SHA1 Message Date
Michael Winkelmann
c78f9352d2 QmlPuppet: Fix build error for ChangeLanguageCommand on MinGW
Change-Id: I190097871e1abf6932fdbb93293e189af7809793
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-21 07:15:49 +00:00
Tim Jenssen
d011e7df25 add some qmlpuppet cpp files to dev package
Since external plugins are interacting with the puppet
we need them in the dev package.

Change-Id: I871629ad80583a09b842bb60cd5b6fab5b512fae
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-20 17:08:28 +00:00
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
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
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
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
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
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
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
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
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
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
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
Jacek Nijaki
c3641b02e4 McuSupport: Update wizard entry point generation
Use app_target_default_main() macro and default entry points that come
with Qul instead providing own main.cpp templates.

Qt for MCUs has own default entry points implementations that may vary
for release to release. OS cmake variable is also removed in Qul 1.4.

Change-Id: I729b28250671c1a873d30d8c6c4f8d12306435d2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-08-18 14:32:01 +00:00
Jacek Nijaki
8c227dea1d McuSupport: Update json kit processing to match Qt for MCUs 1.4
FreeRTOS backend is now a separate platform and requires dedicated json
kit file. Starting form Qul 1.4 there is no option to produce BareMetal
and FreeRTOS kits out of one json file.

This change is backward compatible with Qul 1.3.

Change-Id: Ic50b566a7f1a01fad4b00c07e723dfe1343fc2b0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-08-18 14:31:49 +00:00
Michael Winkelmann
888cbe7f8a QmlPuppet: Refactor ChangeAuxiliaryCommand
Change-Id: I32eb04db96322883aa908e22724756f5e25ded09
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-18 13:25:59 +00:00
Robert Loehning
f830a21bf8 Squish: Update tst_git_local
This doesn't run into QTCREATORBUG-11074 anymore, because
Creator now uses "git add --intent-to-add" when adding files.

Change-Id: I125ff29f9974efad5d22fed220f6155cc5c6804b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-18 13:09:08 +00:00
Eike Ziller
9df06af9bd CMake: Fix comparison of source paths when importing
We need to check canonical paths with canonical paths.
Otherwise we get a mismatch when using e.g. a linked directory for the
source path on the command line and then try to import the build in Qt
Creator.

Change-Id: I153be74b6cfdf5070e023780604ce64c92df0e6d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-08-18 12:24:15 +00:00
Marco Bubke
22fcfb0d6f QmlDesigner: Fix compilation of coretests
This reverts commit 7856c2c2f0. There were files
compiled which are not used in the tests but have external dependencies.
So instead of using the preprocessor we simply don't link the source
files in the project.

Change-Id: Ibba4a1dace1868b016af7135262c795bb29af204
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-18 12:14:06 +00:00
Robert Loehning
2bb89a0fb2 Squish: Adjust expectations in tst_CSUP06
Task-number: QTCREATORBUG-22729
Change-Id: If945eaf188358a69e32e659a4bfa97a6a5e20083
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-18 11:34:59 +00:00
David Schulz
2dddc8520b Debugger: use additional cdb arguments
amends 2942ae876c

Change-Id: Ie1c2eb75300382ff8f350c8a66b893c6bfa21996
Reviewed-by: hjk <hjk@qt.io>
2020-08-18 11:24:03 +00:00
Eike Ziller
f0f1775fd5 macOS: Zoom action should "unmaximize" if already maximized
Task-number: QTCREATORBUG-24495
Change-Id: I94273f6aa9b425b57e328cfdb052dc171718a97e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-18 09:43:32 +00:00
Robert Loehning
0a3f193d1e Update German translation
Change-Id: Ib719b350b97b9df5d6178e61a39b77293c52613c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-18 09:13:53 +00:00
Leena Miettinen
d425710587 Doc: Update mobile app tutorial
- Use Qt Quick Application - Empty wizard template to create
  a simpler project
- Use Add New Assets button to add the Bluebubble.svg file to
  the project and QRC
- Use Connections View Properties tab to add custom properties
- Use Properties view and Binding Editor to specify values for
  the custom properties
- Add screenshots

Fixes: QTCREATORBUG-24478
Change-Id: Ic165684141b06dc1870054c8faa2f27f33162c20
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-08-18 07:03:33 +00:00