aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* QmlDesigner: Fix for States compilation breakAleksei German2020-08-281-15/+15
| | | | | | | | | | | | Fixing compilation break in StatesEditorView: QtCreator is build with 5.12 QScopeGuard is from 5.14+ Replaced scope guard with unique_ptr original task: QDS-2312 Change-Id: Id6a4bf513f37675044b073be2dfe52e3fa9dc3bc Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Fix for RichTextEditor Qt VersionAleksei German2020-08-281-1/+4
| | | | | | | Original task: QDS-2634 Change-Id: I7edc580aec36090e037c4520ad364a62427df9f0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Allow image drag to create Texture on all materialsMiikka Heikkinen2020-08-271-4/+7
| | | | | | | | | | | | Dragging image asset to any 3D material type now creates a Texture out of the image. Default materials assign the created Texture to a diffuse map and principled materials assign it to base color map. Custom material just creates the Texture without any assignments. Task-number: QDS-2657 Change-Id: I065f98cbc4d8c3293fbacea9ef8649d0a2edfb0a Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Update icon fontHenning Gruendl2020-08-272-1/+5
| | | | | | | | | * Update icon font * Use newly added icons in EditableListView Change-Id: Ia21c2120c54c41cd00dca07622ced98a0bf7f7f0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Annotations for StatesAleksei German2020-08-277-15/+158
| | | | | | | | | - Added Annotations support for States Task: QDS-2312 Change-Id: I204ec958f85bd0f05eae0abbb3848d6d59e7e397 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* QmlDesigner: Remove parent as Connections targetHenning Gruendl2020-08-271-15/+6
| | | | | | Task-number: QDS-2651 Change-Id: Ib4520206cc2a3f8a044a66e3e01db0ec603a3029 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix for Rich Text EditorAleksei German2020-08-271-5/+36
| | | | | | | | | | - Fixed tables style - Added border around color selector button Task: QDS-2634 Change-Id: I5a164fedaefa87f394c7815a5bb416ec7898417e Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Change default zoom level for transition editorThomas Hartmann2020-08-271-2/+2
| | | | | Change-Id: Ibc120298cdb766e5ff53fa3b7fda40db7d89650b Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Avoid visual artefactsThomas Hartmann2020-08-272-4/+14
| | | | | | | | Avoid visual artefacts when changing states. Change-Id: I00aa1499ff027d060b06699b60ebd2d5162d0e16 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add suffux to invalid idsThomas Hartmann2020-08-271-3/+10
| | | | | | | | Instead of replacing them with "element" add a suffix. Change-Id: Idc72ba9a8a7b4f48d4e325378b975cafeab88bd4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* QbsProjectManager: Fix install stepChristian Kandeler2020-08-273-8/+19
| | | | | | | | | | | | | We got the install command name wrong, which caused the installation to fail. In addition, we forgot to add handling for the "protocol-error" message from qbs, so the step was hanging, rather than aborting. Finally, we triggered a number of assertions in BuildStep::buildConfiguration(). This went all unnoticed for a while, because the install step is not enabled by default these days. Change-Id: I906e7e472563d4ad8fc7557bd706a7cb67f9f2ba Reviewed-by: hjk <hjk@qt.io>
* Debugger: Fix environment passed to inferior by gdbChristian Kandeler2020-08-271-2/+4
| | | | | | | We must not set variables that the user disabled. Change-Id: I2f559aefd6aaa43298dd9c4889a614a5130622c0 Reviewed-by: hjk <hjk@qt.io>
* Fix qmake build of unittestsChristian Stenger2020-08-2720-25/+24
| | | | | | | | | This basically continues / amends work done with e1c88116b3. Change-Id: Ia8b3a4694e7fea4c15e344839f87c11fbe8fbbf4 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QmlDesigner: Fix UB in QmlPreviewPlugin::getPreviewPlugin()v4.13.0hjk2020-08-251-3/+5
| | | | | | | | | | | Each call to PluginManager::plugins() creates a new QVector object, iterators are only comparable for iterators from the same vector. It worked in practice because the underlying storage was the same here as the QVector objects were only shallow copies. Change-Id: I2e276535942bd949acf91e12873c7bdf9d5c34d6 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CppTools: Do not ignore "built-in" compiler macros for custom toolchainsChristian Kandeler2020-08-241-3/+4
| | | | | | | | | | | | | Built-in compiler macros are normally not passed to the code model, because of potential conflicts with clang. However, in the case of custom toolchains, these macros are provided by the user for the explicit purpose of making them known to the code model. Another exception are the bare metal toolchains, for which we now make sure we won't get out of sync when new ones are added. Fixes: QTCREATORBUG-24367 Change-Id: I2a0458d9132fdff15eb9adfcb2c06d7ef72508bc Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Update qbs submoduleIvan Komissarov2020-08-241-0/+0
| | | | | | | To the head of 1.17 branch Change-Id: I4254418c746303c8a340a93f42128f34d4fa69b9 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Revert "BuildDirectoryAspect: Print non-existing directories in red"Christian Kandeler2020-08-241-1/+1
| | | | | | | | | It's not an error that a build directory does not exist. This reverts commit 2e4915bdb96bc1d5e5bed6f38e13b87db68a97c5. Fixes: QTCREATORBUG-24503 Change-Id: I6138917885b6adbfaef6c49e54a3ea9900ed6b2e Reviewed-by: hjk <hjk@qt.io>
* QmlDesigner: Remove unused custom notificationThomas Hartmann2020-08-242-7/+1
| | | | | | | This notification is only for debugging and breaks encapsulation. Change-Id: I20faeb76d24cc42417b3cc2e289041c70edd6157 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* QmlDesigner: Blacklist some quick3d property names as idsMiikka Heikkinen2020-08-241-1/+3
| | | | | | | | | | Quick3D has some properties that are named same as default ids for some other types, causing conflicts. Blacklist offending properties as ids. Task-number: QDS-2636 Change-Id: I988c69f61608ad7d80726dd74747917360827b84 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: By default item frame should be invisibleThomas Hartmann2020-08-211-1/+1
| | | | | Change-Id: I60b4fbd3c6c4b74845dad783fc264072627a432c Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Update Qbs submoduleIvan Komissarov2020-08-201-0/+0
| | | | | Change-Id: I6f6de1f368cfc6cb94d9503ab9554efc19ae0c97 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Mcu: Extend workaround for missing JSON file for Desktop target to Linuxhjk2020-08-201-1/+7
| | | | | | | | Amends 08fe165ab586e6. Change-Id: I3c3d205f083a3b59ac0490bf7ff22f12fb613b62 Reviewed-by: Jacek Nijaki <jacek.nijaki@siili.com> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlProject: Fix crashThomas Hartmann2020-08-201-0/+3
| | | | | | Change-Id: I6b83b6c05b1c94f62c868329ea118d638d9928b6 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlPuppet: Refactor ChangeIdsCommandMichael Winkelmann2020-08-201-2/+2
| | | | | Change-Id: I75de863121b66a5050226dd5c8914229cb1af608 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* QmlPuppet: Refactor ChangeFileUrlCommandMichael Winkelmann2020-08-201-1/+1
| | | | | Change-Id: I900f530109b6cdbb22d8138094443b48834d16cb Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* QmlPuppet: Refactor ChangeBindingsCommandMichael Winkelmann2020-08-201-5/+4
| | | | | Change-Id: Id3020a73f59a1adfd25066a37d083d923e77956b Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Editor: update autogenerated KSyntaxHighlighting sourcesDavid Schulz2020-08-202-5/+5
| | | | | Change-Id: I77827db6889335250699f942a4cdaf77a5a95337 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* SCXML: fix magnifier not hidingDavid Schulz2020-08-203-0/+22
| | | | | | Fixes: QTCREATORBUG-24463 Change-Id: I835550e32467992ea7ad2555c546d810e6e0bbad Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* AutoTest: Fix persisting of check statesChristian Stenger2020-08-193-6/+7
| | | | | | | | | | | | | | | 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 df49d6e40df47. Change-Id: Id2b85373c151efb5890fe5fb7392bdbc11adda50 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* Annotation: Add export macrosMichael Winkelmann2020-08-191-3/+4
| | | | | | Change-Id: Ieebc2750462bc6266e11318ea96c031b2ea6ef9f Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* TextEditor: Fix remembering highlight definitionDavid Schulz2020-08-191-11/+14
| | | | | | | | | | | Amends 6989c9bbeae1403b8c1733bdae784841369cb8ce 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>
* NodeInstanceView: remove white space for initializersMichael Winkelmann2020-08-191-2/+2
| | | | | Change-Id: I001ade2bb44b771661996e5103a37213a779fd74 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Core: Fix deprecation warning regarding QTimeLine::CurveShapeAlessandro Portale2020-08-191-1/+1
| | | | | | | Since 5.15: "Access easingCurve directly" Change-Id: I75a9f6c898dd2829e1d2a639bd9188c4aeeccc2d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* CMake build: install application icons on LinuxEike Ziller2020-08-191-0/+10
| | | | | | Fixes: QTCREATORBUG-24355 Change-Id: I221d753f96144ef60ba755d2489eed1ed91b3b36 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* CMake build: Fix copying of external toolsEike Ziller2020-08-191-6/+13
| | | | | | Fixes: QTCREATORBUG-24509 Change-Id: Ic19adf009bba326a2b9e59fe561e4021bbf21412 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* McuSupport: Fix warning about missing field initializersAlessandro Portale2020-08-191-2/+6
| | | | | Change-Id: I466f679a5cb583c351e0231a60cd9ce766d58f5e Reviewed-by: hjk <hjk@qt.io>
* Fix more license headersEike Ziller2020-08-191-9/+14
| | | | | | Fixes: QTCREATORBUG-24501 Change-Id: Ie7604f2b977f945744891b3c78e56a7818782a1d Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* Utils: Fix persisting of QRectChristian Stenger2020-08-192-2/+2
| | | | | | | | | | | | 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>
* Core: Fix filter of variable chooserChristian Stenger2020-08-191-1/+3
| | | | | | Fixes: QTCREATORBUG-24499 Change-Id: I787fc4342556d7062a1de5e7cb52d9d48532e719 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix some license headersEike Ziller2020-08-191-9/+14
| | | | | | | | Missing the GPL part. Fixes: QTCREATORBUG-24501 Change-Id: I9e8e033399c050af29927d0ee735f9bcd05345bf Reviewed-by: hjk <hjk@qt.io>
* McuSupport: Read RGL configuration from jsonJacek Nijaki2020-08-181-37/+56
| | | | | | | | | | | | 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>
* McuSupport: Update wizard entry point generationJacek Nijaki2020-08-185-65/+4
| | | | | | | | | | | 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>
* McuSupport: Update json kit processing to match Qt for MCUs 1.4Jacek Nijaki2020-08-182-35/+136
| | | | | | | | | | | 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>
* QmlPuppet: Refactor ChangeAuxiliaryCommandMichael Winkelmann2020-08-181-3/+2
| | | | | Change-Id: I32eb04db96322883aa908e22724756f5e25ded09 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* CMake: Fix comparison of source paths when importingEike Ziller2020-08-181-2/+4
| | | | | | | | | | 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>
* QmlDesigner: Fix compilation of coretestsMarco Bubke2020-08-188-38/+33
| | | | | | | | | | This reverts commit 7856c2c2f025787f0b0f588bf6a01bf0fa48beea. 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>
* Debugger: use additional cdb argumentsDavid Schulz2020-08-181-0/+2
| | | | | | | amends 2942ae876cba9c2082dc383842fbd781766ddef8 Change-Id: Ie1c2eb75300382ff8f350c8a66b893c6bfa21996 Reviewed-by: hjk <hjk@qt.io>
* macOS: Zoom action should "unmaximize" if already maximizedEike Ziller2020-08-181-1/+10
| | | | | | Task-number: QTCREATORBUG-24495 Change-Id: I94273f6aa9b425b57e328cfdb052dc171718a97e Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Do not assume MCU as the defaultThomas Hartmann2020-08-171-1/+1
| | | | | | | | Fixes the sympton of QDS-2554, but not the real issue. Task-number: QDS-2554 Change-Id: I8e0aca0b843bcb2befdc2d9a85b2dbfdb468ffb2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Add missing includeThomas Hartmann2020-08-171-0/+2
| | | | | Change-Id: Ib521eab639f416fcacece6d396bc90c2fa473235 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>