aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/designercore
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: Introduce multiple node instance serverMarco Bubke2020-09-112-1/+3
| | | | | | | | | | | | For capturing data we need a atomic mechanism. So in one process multiple node instance server can be started and then a command is send back that a scene is created. It can be used to ensure that captured data of views is up to date. Task-number: QDS-2630 Change-Id: Iea8d0b036b6384c9c1b0f91af401f2b1f1978c12 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix image id generation for names starting with digitMiikka Heikkinen2020-09-081-1/+6
| | | | | | Change-Id: I763e8b49d0b8dd3274bea79d61156321185706a5 Fixes: QDS-2759 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Generate qml id from image file nameMiikka Heikkinen2020-09-043-23/+21
| | | | | | | | | | | | | | | When dragging an image file to create a Image or Texture item, base the id on the file name rather than setting it to generic name based on type. This includes cleanup of AbstractView::generateNewId to remove redundant and unused code as well as an option to provide a fallback id prefix. Change-Id: I563f1760ffbace9c5c2145477ec8736836f36c45 Fixes: QDS-2328 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Make active3dScene internal (not saveable)Mahmoud Badri2020-09-011-3/+1
| | | | | | | Task-number: QDS-2699 Change-Id: I7c8e8245c7f4631a7f3cac121ed9a88e3395f579 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Fix compile of testsChristian Stenger2020-08-281-1/+0
| | | | | | Change-Id: If791e1e2eb7c9b4d04c13ecd5db531abef9069fa Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Annotations for StatesAleksei German2020-08-272-0/+47
| | | | | | | | | - Added Annotations support for States Task: QDS-2312 Change-Id: I204ec958f85bd0f05eae0abbb3848d6d59e7e397 Reviewed-by: Vikas Pachdha <vikas.pachdha@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>
* QmlDesigner: Remove unused custom notificationThomas Hartmann2020-08-241-3/+0
| | | | | | | 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>
* 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>
* 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>
* NodeInstanceView: remove white space for initializersMichael Winkelmann2020-08-191-2/+2
| | | | | Change-Id: I001ade2bb44b771661996e5103a37213a779fd74 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* QmlPuppet: Refactor ChangeAuxiliaryCommandMichael Winkelmann2020-08-181-3/+2
| | | | | Change-Id: I32eb04db96322883aa908e22724756f5e25ded09 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* QmlDesigner: Fix compilation of coretestsMarco Bubke2020-08-187-38/+32
| | | | | | | | | | 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>
* QmlDesigner: Add missing includeThomas Hartmann2020-08-171-0/+2
| | | | | Change-Id: Ib521eab639f416fcacece6d396bc90c2fa473235 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix compilation of coretestsThomas Hartmann2020-08-173-4/+14
| | | | | Change-Id: Idd0c717078ac8d4fed9a8d4dfe000091ee2384c5 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Fix compile before Qt5.15Christian Stenger2020-08-141-1/+1
| | | | | Change-Id: I0f2f363a691dda1a79f773ebf7885a68fbfcbaa9 Reviewed-by: hjk <hjk@qt.io>
* QmlDesigner: Reactivate stream capturingMarco Bubke2020-08-133-6/+25
| | | | | Change-Id: I041392e490bb4e104e917f4164d7d82bae03c2d8 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Merge "Merge remote-tracking branch 'origin/qds-1.59' into 4.13" into 4.13The Qt Project2020-08-1320-670/+1127
|\
| * Merge remote-tracking branch 'origin/qds-1.59' into 4.13Tim Jenssen2020-08-1320-670/+1127
| |\ | | | | | | | | | Change-Id: Ic720f3adab305c5ef8cd10e713ccabf510eff0c0
| | * Prepare merge of qds-1.59 to 4.13qds-1.59Marco Bubke2020-08-136-0/+9
| | | | | | | | | | | | | | | | | | | | | It is not compiling but we are closing this branch anyway. Change-Id: If96318175d92ae492871d668d5c937c473fd05d5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| | * QmlDesigner: Split messaging and process for puppetsMarco Bubke2020-08-1020-651/+1109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it easier to implement custom puppets. The new connection manager will restucture the code and it add a mechanism to capture data too. Task-number: QDS-2529 Change-Id: I5d15c3303ef1c9a3e25ba197d350e0d561ce813a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| | * QmlDesigner: Fix typo bugMarco Bubke2020-08-101-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I074beda7dc5fa6dc2775e764983bf72e17ea90cf Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
| | * qmlproject: rename lastUsedLanguage -> currentLocaleTim Jenssen2020-07-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed the connection from plugin to QmlMultiLanguageAspect::setCurrentLocale but calling it directly in QmlPreviewPlugin::setLocale Does not matter which method is called it will change the right thing only once because it is checking if it already have the set locale. Change-Id: I6cb4b115788adc103481dcda45e3214a0cd73401 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| | * qmlproject: add convenience method to QmlMultiLanguageAspectTim Jenssen2020-07-212-17/+7
| | | | | | | | | | | | | | | Change-Id: I88799aa1c5caa5c967b7c680ef9ddcbdd4b01bf5 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| | * Revert "qmlpuppet: do not set an empty QT_MULTILANGUAGE_DATABASE"Tim Jenssen2020-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 00b54f7faf33d679d62d309c9ccaf7ef60087483. Not sure why this was necessary - but it introduced a problem which needs a restart of the puppet - so it is easier to revert it. Change-Id: I4664b57eefc961ac814e4594b28bbd155be21042 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| | * qmlpuppet: do not set an empty QT_MULTILANGUAGE_DATABASETim Jenssen2020-07-201-1/+1
| | | | | | | | | | | | | | | Change-Id: Ib64a2192692a2675852fd3071295c0ed8dc29d4d Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* | | QmlDesigner: Extend Connections view supportAleksei German2020-08-132-1/+14
|/ / | | | | | | | | | | | | | | | | | | - Connection view support to components - Connection view support to singletons - Minor reparenting improvements Task: QDS-2411 Change-Id: I337535012dbb3d3a1722d75d89156463eabb8a4c Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
* | Add/remove the simulink component when the import is added/removedMahmoud Badri2020-07-102-12/+0
| | | | | | | | | | | | Task-number: QDS-2122 Change-Id: Ib4e2ff14ed9cfef1534f9c3edb0a8279fbabfd6a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Add slot/function support to NodeMetainfoThomas Hartmann2020-07-072-1/+48
| | | | | | | | | | | | Change-Id: Ie8e153d552a003ca189b65fe8691cb84091c8159 Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Fix for broken prototypes in templatesThomas Hartmann2020-07-071-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just a band-aid fix. plugins.qmltypes can contain "duplicated" cpp type declarations, some without export, similar to a forward declaration. This is the case for QQuickItem in templates for example. The prototype for QQuickItem in this case is not assoicated with QtQuick.Item, which we expect. Task-number: QTCREATORBUG-24283 Change-Id: I3377760e29f1af5c8e948aaa1ae7883448116872 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Core/Utils: Migrate further to Utils::Idhjk2020-07-062-2/+2
| | | | | | | | | | | | | | | | The coreplugin/id.h header is kept for downstream for now. Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66 (cherry picked from commit 430a33dcd9ac80ddb848e41f8f059102857c88aa) Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | QmlDesigner: Rename CppTypeData to QmlTypeDataThomas Hartmann2020-07-035-21/+60
| | | | | | | | | | | | | | | | | | Also adding getQMLSingletons(). The Backendmodel now also knows about QML singletons. Change-Id: I96e130678ef956e569960c431f45bd362d026f5f Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Support aliases in Connection ViewAleksei German2020-07-022-0/+14
| | | | | | | | | | | | | | | | | | | | - Allows user to select aliases in connections view - Seeks signals for aliases Task: QDS-2411 Change-Id: I69eb875eb99cbf8cd6a842d5f7e166d9990bb255 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/qds-1.59' into 4.13Tim Jenssen2020-07-016-8/+57
|\| | | | | | | | | | | | | Conflicts: src/tools/clangpchmanagerbackend/source/pchtaskqueue.h Change-Id: Ibe8ac2fa0eafcbcc86ac445f0be035839e06ff40
| * QmlDesigner: Add listmodeleditorMarco Bubke2020-06-302-2/+31
| | | | | | | | | | | | Task-number: QDS-2294 Change-Id: I66cae3a0d4265ab112eaf6b04e3a5972d185ff43 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * QmlDesigner: Break dependenciesMarco Bubke2020-06-304-6/+26
| | | | | | | | | | | | | | | | | | To get the model under unit tests we have to break every depenedency to code outside of the unit test scope. Change-Id: Ib613c3308e48990c55b2ed0cd42bc4b0e1041a01 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Fix crashThomas Hartmann2020-06-291-0/+3
| | | | | | | | | | Change-Id: I67c2a97e44c2bdc6973c2a3d3cbc222c46b1c461 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/4.13'Eike Ziller2020-06-297-60/+85
|\ \ | | | | | | | | | Change-Id: Ie67085fcbb4150c60f0253312e19a82b95b4a898
| * | Merge remote-tracking branch 'origin/qds-1.59' into 4.13Tim Jenssen2020-06-267-60/+85
| |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/clangformat/clangformatplugin.cpp src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp src/plugins/qmldesigner/qmldesigner.qbs Change-Id: Ie4a0beeb9fd32ac9683f4e8769988a9c3f3e369a
| | * QmlDesigner: Remove old QtQuick 1 codeThomas Hartmann2020-06-251-4/+1
| | | | | | | | | | | | | | | Change-Id: I523419689ab7667900de6ca72aa736e14064ab34 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| | * QmlDesigner: Properly resolve "dot properties" for dynamic objectsThomas Hartmann2020-06-251-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | property NumberAnimation numberAnimation: NumberAnimation { } In this case this will expose the "dot properties" of numberAnimation. Change-Id: I40aafcc4f762ab6297c0829674ac62d92cbd713d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| | * QmlDesigner: Add properties for sortingThomas Hartmann2020-06-241-0/+2
| | | | | | | | | | | | | | | Change-Id: I887e3b06ca3accc243283e1ac0895ab81bbdf513 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| | * qml: introduce QmlMultiLanguageAspectTim Jenssen2020-06-183-23/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This aspect is only available if the special multilanguage plugin is available. Translation changes in that plugin changes this aspect, which results in environment variables which activate the use of a multilanguage created sqlite to provide the translations. Change-Id: I38250b69165eb7ec3e4f82dc34b3cc4ba0a33f8f Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| | * QmlDesigner: Fix FlowDecision transitionHenning Gruendl2020-06-152-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the transition for FlowDecision so it will also connect to QmlFlowItemNode directly without the need of a QmlFlowActionAreaNode. Task-number: QDS-2280 Change-Id: I61a5ab234068bcbc0c28ae43c720d7fc22e941b6 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| | * QmlDesigner: Do not allow invalid annotationsThomas Hartmann2020-06-111-0/+8
| | | | | | | | | | | | | | | | | | Task-number: QDS-2269 Change-Id: Ib98cce353d7a92222013b0c2033a7524dddd5403 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| | * QmlDesigner: Do not resize FlowItemsThomas Hartmann2020-06-111-1/+2
| | | | | | | | | | | | | | | Change-Id: I19d49c05b4119caa38cb554eaea57dc888835f4e Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| | * qmldesigner: add language to create scene commandTim Jenssen2020-06-111-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | and also save the last used language to settings Task-number: QDS-2218 Change-Id: Ib82f7bc755755661183452b32829be3d048d9947 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 19:52:39 +0000