aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner
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>
* 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>
* 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>
* 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-193-13/+41
|\ | | | | | | 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-141-6/+14
| | | | | | | | | | | | | | | | | | | | 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>
* | QmlDesigner: Fix qbs buildChristian Stenger2020-10-191-0/+5
| | | | | | | | | | Change-Id: Ia2671a5491b8f5dbc8e4b771c5fe2a080a76b863 Reviewed-by: David Schulz <david.schulz@qt.io>
* | QmlDesigner: Add image cacheMarco Bubke2020-10-1659-169/+2287
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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>
* | 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>
* | 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>
* | 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>
* | 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>
* | 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-121-0/+1
|\| | | | | | | Change-Id: Ifa2e1ced939e1d049ba6de667b31ab9945094b87
| * qmldesigner: fix missing update after setFrameColorTim Jenssen2020-10-121-0/+1
| | | | | | | | | | Change-Id: I9d809bb62bdd3b0d141e1cff39cbf4a9fca58c39 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Return placeholder preview image for non-visual componentsMiikka Heikkinen2020-10-121-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | Preview image is returned when a 2D item render results in a blank image. Also improved device pixel ratio handling. No longer always render preview at 2x ratio, if not needed. Change-Id: I67b7563dffea523ea85be23b6a0e8b802c0f03fb Fixes: QDS-2893 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | qmldesigner: use right include syntaxTim Jenssen2020-10-121-6/+6
| | | | | | | | | | Change-Id: Iafd04ad287bac6b0c94359fa54893904de61aa96 Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* | QmlDesigner: Compile with Qt 6hjk2020-10-082-2/+2
| | | | | | | | | | | | | | | | Qt 6 does cannot handle forward-declared types in signal declarations. Change-Id: Iad4a810841df3d077750ad76c892bdb7eecc0a80 Reviewed-by: Knud Dollereder <knud.dollereder@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.14' into masterEike Ziller2020-10-0810-152/+438
|\ \ | | | | | | | | | Change-Id: Ie53b4c2516d80a653d51bc6b666040c586ce44ab
| * \ Merge "Merge remote-tracking branch 'origin/4.13' into 4.14" into 4.14The Qt Project2020-10-081-0/+2
| |\ \
| | * | Merge remote-tracking branch 'origin/4.13' into 4.14Eike Ziller2020-10-081-0/+2
| | |\| | | | | | | | | | | | | Change-Id: Ia20a937786be651a5fe9daefb856f7779905ef68
| | | * qmlprieview: fix that init language is the chosen oneTim Jenssen2020-10-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * removes language feature from preview service * it is handled by an extra DebugTranslationService until now * Qt versions without that extra service can not preview languages anymore * Introduce the use of QmlPreviewRunnerSetting. It makes it easier to add more properties in the future * Language needs an extra handling because it needs the loadUrl to find existing languages. So we save the language to a m_scheduledInitLanguage and emit this after the loadFile call happend. Change-Id: I7f4aec97f7b61d6b290f225282169da594eb9160 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| * | | QmlDesigner: MCU Metadata improvementsAleksei German2020-10-083-8/+29
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | - Introduced allowChildren switch Task: QDS-2794 Change-Id: Ie992fb173e8eacb27b10679d5ff28238277aa346 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | QmlDesigner: MCU configurations metadataAleksei German2020-10-069-141/+404
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Removed c++ hardcoded info about QDS MCU restrictions -Instead replaced it with dynamically loaded qml files -Replaced QLists with QSet/QHash to improve performance Task: QDS-2794 Change-Id: Ifc23d1299155001b6573dc0ed789dda5d2cfaf24 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | CMake build: Add missing PROPERTIES to add_qtc_pluginEike Ziller2020-10-061-7/+7
| | | | | | | | | | | | | | | | | | | | | And use it for QmlDesigner Change-Id: Id7221ee2288159ff2faaf4ac483570034927f1b4 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | | Remove unused private functionsAlessandro Portale2020-10-082-39/+0
| | | | | | | | | | | | | | | | | | | | | As found by Cppcheck. Change-Id: I697ea69992425ff41e35990ad00be312b35ba70a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | | QmlDesigner: Add customComponentSource to ItemLibraryEntryThomas Hartmann2020-10-063-0/+17
|/ / | | | | | | | | Change-Id: Ief7555b321ae3bdc790b2e747d367347031a4a56 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* | QmlDesigner: Show selection in DebugViewThomas Hartmann2020-10-051-0/+12
| | | | | | | | | | Change-Id: Ica85a227e6976464480a3b3dd91d4d42f1ed1528 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Fix crashThomas Hartmann2020-10-052-4/+8
| | | | | | | | | | | | | | We have to check if the view is actually detached. Change-Id: I160c1a15f921092ef66999ed6a27ffcdbbe205d9 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Delete existing node when property does not allow listThomas Hartmann2020-10-051-4/+23
| | | | | | | | | | | | | | | | | | | | | | Some properties can only contain a single QML element. In this case we should delete the old existing element. This can be checked using NodeMetainfo::propertyIsListProperty. Change-Id: I1782a38b7bfdb8a6f1078b0fa39654a4653dab59 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | QmlDesigner: Do not keep separate selection stateThomas Hartmann2020-10-054-10/+6
| | | | | | | | | | | | | | | | When nodes are deleted the selection can changes without a notifier. There is no reason to keep the selection separately. Change-Id: I166d3695762e3d5cd6ff4808586384fd26bafef4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | QmlDesigner: Add const to selectedModelNodes()Thomas Hartmann2020-10-052-2/+2
| | | | | | | | | | | | | | | | Otherwise we have to use qAsConst when using ranged for. Change-Id: I6bb166be1525b0b75939c9a134b507e561f7bbd0 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | QmlDesigner: Add QtQml.Component as component typeThomas Hartmann2020-10-051-5/+2
| | | | | | | | | | Change-Id: Ief07ffc863de978b6082adfec3477b00a7309654 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-10-051-0/+3
|\| | | | | | | Change-Id: I565a0bd783dc80b53d4715fdc153dba1f1d3f7c7
| * qmldesigner: Avoid crash of TextToModelMerger::getQMLSingletons()Fawzi Mohamed2020-10-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | When m_scopeChain is invalid (due to an invalid ui file) getQMLSingletons would trigger a crash. Catch this case and return early (an error message would then be displayed). Fixes: QTCREATORBUG-24587 Change-Id: I80c70d8e7f1c88b14c53d3daebf957dc1e6089ee Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Fix crashThomas Hartmann2020-10-022-4/+2
| | | | | | | | | | | | | | | | | | We have to call updateEnabledViews() in the correct places. AbstractView::modelAboutToBeDetached() was to late, since the view is already removed at this point. Change-Id: I6d71d5ea773fb7ec8ec258344498a229a30dd9b3 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Disable TimelineEditorView when not visibleThomas Hartmann2020-10-023-0/+19
| | | | | | | | | | | | | | Change-Id: If67a027c9ad52b2b2fa62df8cf94afdd1c2c49d7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Disable TransitionEditorView when not visibleThomas Hartmann2020-10-023-0/+19
| | | | | | | | | | | | | | Change-Id: I76a1829dae18d651168f92558d65beb8b94f1f88 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner Disable FormEditorView when not visibleThomas Hartmann2020-10-024-21/+64
| | | | | | | | | | | | Change-Id: I4bf6f3747cfd11fa31bdd386efc11fc27dbfe45c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Respect canBeContainer on drag from library to navigatorMiikka Heikkinen2020-10-023-37/+59
| | | | | | | | | | | | | | | | | | | | If the parent node can't be a container for the newly created node, the newly created node is deleted within the same transaction. Change-Id: I4f4771add3aae5b4509b3bb0a8fbabfed2e7c99e Fixes: QDS-2660 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 03:17:23 +0000