aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: Add missing includeRobert Loehning2020-10-201-0/+2
| | | | | | | | Amends 3614ab81ce9726b17b0c725ff55e1ae5be3ab7d1 Change-Id: Ib8a02fe5829462379ae9a665b5c0e8e8832cc090 Reviewed-by: Knud Dollereder <knud.dollereder@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Remove SwitchsplittabwidgetMahmoud Badri2020-10-207-284/+0
| | | | | | | Removed the unused class Switchsplittabwidget from the codebase. Change-Id: Idb0071d4e6bb54b6a08e6026f8768f9239a5c342 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix incorrect conversion between double and int/longEike Ziller2020-10-201-1/+1
| | | | | | | | | | | And fix macOS build which complained that std::abs with doubles is ambiguous (between int and long and long long). Amends aaf564cab7cbb0a79c37098bd9642a72cef9a9ba Change-Id: I87d4453afa4dda676cc27c219d7dbfc22fcee70a Reviewed-by: Knud Dollereder <knud.dollereder@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Fix compilation of sdktool against old Qt versionsEike Ziller2020-10-201-0/+7
| | | | | | | Amends 6c5eaed92ca838e68745c71ee27adb754a496b8e Change-Id: Ia664ea16767e9787252ec529061c7d5f5d89a7de Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Remove AnnotationToolMahmoud Badri2020-10-206-359/+0
| | | | | | | | | | Remove AnnotationTool from FormEditor's selected item's tools. Change-Id: I797ed4002d14c04956aaeb5d779f1cf3f326f849 Fixes: QDS-2970 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* ClangRefactoringBackend: Fix build with Clang 11Cristian Adam2020-10-202-0/+2
| | | | | Change-Id: Id03b0771e242534943e062dee3e63022ec9d9ce8 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Revert "Editor: Make line spacing adjustable"David Schulz2020-10-207-197/+86
| | | | | | | | | | | This does not work with text wrapping since there are multiple QTextLines inside a block but we can not adjust the line hight inside a block. This needs to be addressed inside Qt. This reverts commit dc64f3207bdf6c0d295859e47791cb8193e67f4e. Change-Id: If6c28056da9891eeeb75f5939a42f08360013a80 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Editor: fix completion character completionsDavid Schulz2020-10-191-2/+3
| | | | | | | | | | Cleanup the proposal after an item is activated even if the proposal widget is not visible anymore. Otherwise we might wrongly cleanup a proposal that was triggered by a completion character while a completion list was already open. Change-Id: Ie95247de09313c5816cffd9a865b05183db02354 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* LanguageClient: pass id as a const ref when handling client messagesDavid Schulz2020-10-195-10/+10
| | | | | Change-Id: I7ab6a7517d4dd0fe66f601661e7b3f6a7afb338b Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* CurveEditor: Fix bounding rect computation for the graphicssceneKnud Dollereder2020-10-198-10/+56
| | | | | | | Task-number: QDS-2957 Change-Id: I0019d538e7460e923b35024bd02f7186e1935f6b Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* CMake build: Fix build of QmlDesignerEike Ziller2020-10-191-0/+10
| | | | | | | Follow-up of d1b0c12d6b6c4698492851716b3931bc9cae5fd3 Change-Id: I04491e815f8a8220c3719ca6bfdbf6de3e30b527 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Utils: Fix matching wildcards to full pathsChristian Stenger2020-10-194-2/+75
| | | | | | Fixes: QTCREATORBUG-24792 Change-Id: I82b4edea6260b07e1bdff065b157a4cd044ec629 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: Fix reversed order on Navigator dropHenning Gruendl2020-10-191-3/+3
| | | | | | Task-number: QDS-2910 Change-Id: Iab58b79b6f3cdb3f922824a7f608b633b019c9ae Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Merge remote-tracking branch 'origin/4.13' into 4.14Eike Ziller2020-10-194-14/+42
|\ | | | | | | Change-Id: If549dd1bc610704ece881c408cf44192dabed8b9
| * Automatic generation of Description & Display Condition tabLukasz Ornatek2020-10-162-7/+27
| | | | | | | | | | | | | | Task-number: QDS-2862 Change-Id: I367f336e84025b593e51faf282ad9c923cfeac54 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
| * qmlpreview: fix calling right localeIsoCode methodTim Jenssen2020-10-142-7/+15
| | | | | | | | | | | | | | | | | | | | Also add some QTC_CHECK to get at least some warning in case the functions are renamed in future. Change-Id: Ie4e78855152e9946950603c95fa881755e850c62 Reviewed-by: Marco Bubke <marco.bubke@qt.io> (cherry picked from commit 165ccb828d5f741c91ebdc0bf6e50bd980497640) Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Remove invisible translated stringsRobert Loehning2020-10-197-21/+0
| | | | | | | | | | Change-Id: If03c1e5d160d375e3a8ecd2c534214e3c92ae918 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | CMake Build: Fix missing pythonXY.zip on MSVCCristian Adam2020-10-191-6/+21
| | | | | | | | | | | | | | Ammends 94b9b33a17e3f7760cbbf9abd021984839106647 Change-Id: I531a648a108233fbefbe6878f65f8ab7186db39a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | ClangCodeModel: Use a configurable timeout in the testsChristian Kandeler2020-10-193-13/+17
| | | | | | | | | | Change-Id: Ie3923217f79a72d2774aaa2a499144c3191cb478 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | LanguageClient: Generate BaseMessage only once per send contentDavid Schulz2020-10-191-4/+3
| | | | | | | | | | Change-Id: Ife4135dce924db83b8539035b4837ecee1403ad8 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QmlDesigner: Fix qbs buildChristian Stenger2020-10-191-0/+5
| | | | | | | | | | Change-Id: Ia2671a5491b8f5dbc8e4b771c5fe2a080a76b863 Reviewed-by: David Schulz <david.schulz@qt.io>
* | TextEditor: fix selection highlightDavid Schulz2020-10-191-1/+2
| | | | | | | | | | | | | | | | | | Also compare the anchor when looking for the selection. Otherwise we might get a selection highlight that expands on adjacent extra selections like code model warnings. Change-Id: Ib8460c1089ed69d14b7a408ca70e7ac1f8642f6e Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Android: fix aab label name and supported versionsAssam Boudjelthia2020-10-162-2/+3
| | | | | | | | | | | | Task-number: QTCREATORBUG-24681 Change-Id: I5634deaf395d547d2659d71d1612897e1a3d9a2b Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | QmakeProjectManager: Make "system" execution opt-inChristian Kandeler2020-10-169-8/+65
| | | | | | | | | | | | | | | | | | | | It has too many side effects. Amends fcd6384f4d. T_SYSTEM and E_SYSTEM are now treated the same. Fixes: QTCREATORBUG-24551 Change-Id: Ib6df2762d329f2ddc0dd66190454159d446a9ac9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | QmlDesigner: Add image cacheMarco Bubke2020-10-1672-190/+2463
| | | | | | | | | | | | | | | | | | | | | | | | The image cache is saving images and icon of this images in a sqlite database. If there are no images they are generated in the backgound. The icons are fetched by item library. Task-number: QDS-2782 Task-number: QDS-2783 Task-number: QDS-2858 Change-Id: I5a32cccfef7f8fd8eb78902605a09f5da18ce88e Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Sort items in FileResourceModelHenning Gruendl2020-10-162-10/+29
| | | | | | | | | | | | | | | | | | * Sort items in FileResourceModel * Add FileSystemWatcher on directory Task-number: QDS-2919 Change-Id: I0ba50f03d4f901a48709ed0cc0e7f05d3037aeec Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | Android: Aspectify AndroidDeployQtStephjk2020-10-162-53/+18
| | | | | | | | | | Change-Id: Ibc2f04336831494c04a2283a59e1f550776c8bf3 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Debugger: Use -file-symbol-file for core files with GDBhjk2020-10-161-1/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-24541 Change-Id: Ib6d070629f5a7d1505c272ce78f99dc14cd15fdc Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | AutoTest: Prefer active target over furtherChristian Stenger2020-10-161-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | If there are more than one target for a run configuration we ended up in the first matching. Tests may use different environments to test different things. If the user tried to handle this by using a modified environment for different targets failed even when the correct target was selected. Change-Id: Ie954c985969ffd187fe60b4ecb86aa2717d559f1 Reviewed-by: David Schulz <david.schulz@qt.io>
* | QmlDesigner: Fix recent regressionThomas Hartmann2020-10-151-0/+4
| | | | | | | | | | | | | | | | | | | | After calling differenceHandler.typeDiffers() the modeNode can be invalid. We have to account for this. Task-number: QDS-2954 Change-Id: I76e28dcd3f1a824802e60bf47b773f5b8cb3d15a Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Account for qmake.bat script for Qt 6 targetsAssam Boudjelthia2020-10-151-1/+7
| | | | | | | | | | | | | | | | | | | | | | Qt 6 targets that are built with CMake have a qmake.bat instead of qmake.exe, while they can be registered from the Qt installer using QC's sdktool, it's not yet possible to select a new version manually because the FileDialog selection offers only qmake*.exe. Fixes: QTCREATORBUG-24721 Change-Id: I647be1e0fba2f306402b8dbed747e9614a4eb0ea Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | ClangTools: Further increase the test timeoutChristian Kandeler2020-10-152-1/+10
| | | | | | | | | | | | | | | | | | The clazy tool in particular can be exceedingly slow on Windows. Increase the default timeout and also add a hook to set the timeout at runtime via the environment. Change-Id: I94c46ce03f8348fb239870df4d5627bf8d545307 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QmlDesigner: Fix compile of testsChristian Stenger2020-10-151-2/+15
| | | | | | | | | | Change-Id: Idd2097a7e571d5891c3769102bb7b0ebd9264ac6 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Bind meta info cache to modelMarco Bubke2020-10-147-28/+18
| | | | | | | | | | | | | | | | A global variable is not helping for multithreading and the cache has anyway a 1:1 relationshit to the model. Change-Id: Ic05f32744b70ef63aa5ae7d475afc0b5b17f2f09 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Git: Deduplicate stderr output on commitOrgad Shaneh2020-10-141-3/+1
| | | | | | | | | | | | | | It appears while the process is running, then printed again when it's done. Change-Id: I86737eccfcf34d82ccca1ec4b9a7f42fc66bf86c Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | Revert "QmlDesigner: Keep possible imports updated"Tim Jenssen2020-10-142-20/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit a9619b53f36209036306e8d2738995edbc13d92b Reason for revert: broke stop puppet debugging feature Change-Id: I88cf4ca7503a6bd7c3d8309cd7c3220428d07a20 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmakeProjectManager: Ensure consistent include path listsChristian Kandeler2020-10-141-6/+11
| | | | | | | | | | | | | | | | | | ... before and after a build. The previous algorithm did not guarantee the same order, leading to failure when analyzing an unbuilt project with clang-tidy/clazy. Change-Id: I8a700408ca0c23b1b14b47ebfe334a41c52afa5b Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Designer: Relax type difference check on node syncVikas Pachdha2020-10-132-2/+7
| | | | | | | | | | | | Task-number: QDS-2535 Change-Id: Ic762d40f9088d287db4d7c0c88bb7817b2bf6475 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | CppTools: Fix test on WindowsChristian Kandeler2020-10-131-6/+6
| | | | | | | | | | | | | | Another CRLF issue. Change-Id: I172bcef5beabf1c85eb3c0b66a1839c03a870f8c Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Enable touch-pad navigationKnud Dollereder2020-10-1221-52/+311
| | | | | | | | | | | | | | | | | | | | For the curve-editor, transition-editor and timeline Renamed ruler-scaling-factor to zoom in order to not confuse it with ruler-scale-factor Change-Id: I099e8e9a1e6092c9abb0a1a935fb8510aa90d5e4 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Icon visibility in navigatorHenning Gruendl2020-10-122-0/+7
| | | | | | | | | | | | | | | | | | Show alias, visibility and lock icons in the navigator only when either checked or hovered. Task-number: QDS-2785 Change-Id: I1eca1b9f44cfbdd839daa64849156e1c9ffa4acd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Add lock functionality to navigatorHenning Gruendl2020-10-1236-92/+472
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update icon font and change related theme and constants files * Add locked column to Navigator * Add auxiliary property "locked" * Integrate locked feature into the following components: * Transition Editor * Connection Editor * Form Editor * Text Editor * Timeline * Navigator * State Editor Task-number: QDS-826 Change-Id: Ibf3ae96e0d5daeb1ab00279b94df5aaabe75e0bb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | CppEditor: Fix Typedef Handling with 'Remove Using Directive' QuickFixLeander Schulten2020-10-123-2/+87
| | | | | | | | | | | | | | | | Previously, typedefs were ignored and the new code became invalid after applying the quickfix. Change-Id: I0d4295e90d02dfacc3edac5ac3f96d9edbeaf662 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | QmlDesigner: Show anchors menu only if applicableThomas Hartmann2020-10-121-10/+10
| | | | | | | | | | | | Change-Id: I09e6e14f96b62b561027694ebc5a73b51c6ab8d8 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Disable group menue if selection is emptyThomas Hartmann2020-10-121-1/+6
| | | | | | | | | | | | Change-Id: I1b64bbe7a6217ed08c8a1f72435cd67eea6209a0 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into 4.14Orgad Shaneh2020-10-124-3/+70
|\| | | | | | | Change-Id: Ifa2e1ced939e1d049ba6de667b31ab9945094b87
| * ProjectExplorer: Fix compile output window scroll issueChristian Kandeler2020-10-121-1/+1
| | | | | | | | | | | | | | | | | | Flushing the formatter directly from the build manager interferes with the scrolling logic in OutputWindow. Fixes: QTCREATORBUG-24728 Change-Id: I018944a44bcc3115c17ba83708da8f155b496f39 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * ProjectExplorer: Fix small visual glitch when rebuildingChristian Kandeler2020-10-121-0/+1
| | | | | | | | | | | | | | | | All but the first build would insert an extra newline at the top of the compile output window. Change-Id: Ief88acfb6226ec2d1de9865f041e9f07c48f6c49 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * qmlpreview: add test translation color settingsTim Jenssen2020-10-122-2/+67
| | | | | | | | | | Change-Id: I9b11fcf1fdae39b089887884a3d96cc8648a0c8a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * qmldesigner: fix missing update after setFrameColorTim Jenssen2020-10-121-0/+1
| | | | | | | | | | Change-Id: I9d809bb62bdd3b0d141e1cff39cbf4a9fca58c39 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 15:46:13 +0000