summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner/designercore/instances/puppetcreator.h
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: Merge cmake filesMarco Bubke2022-10-071-92/+0
| | | | | | | | | | | | To improve testability external dependencies are now broken with an interface. It is a first step to test individual units without injection of source files. Task-number: QDS-7571 Change-Id: I4255c8668022f1097947e4ea5788f2a6b605365d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Merge remote-tracking branch 'origin/8.0'Tim Jenssen2022-09-221-3/+0
|\ | | | | | | | | | | | | | | | | resolved conflicts: share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp src/plugins/qmldesigner/components/formeditor/formeditorview.cpp src/plugins/qmldesigner/designercore/exceptions/exception.cpp Change-Id: I13a5248415fa1ae03e1c6d0972d9b3bb8c80a3b0
| * qmldesigner: make DesignerSettings thread saveTim Jenssen2022-09-211-3/+0
| | | | | | | | | | Change-Id: I07074b35456533e9729644ef3647803d477bd6f1 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* | Use SPDX license identifiersLucie Gérard2022-08-261-24/+2
|/ | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlDesigner: If kit has a qml2puppet in bin then use itThomas Hartmann2021-07-291-4/+1
| | | | | | | | | | If the Qt has a qml2puppet in the bin folder we use it instead of the fallback puppet. Task-number: QDS-4548 Change-Id: Ic9a3626f0cb18538ed94b72ff9fce0fa43806597 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
* QmlDesigner: Forward QT_IM_MODULE=qtvirtualkeyboard to puppetThomas Hartmann2021-03-091-0/+1
| | | | | | | | | | If QT_IM_MODULE=qtvirtualkeyboard is used for the application, when we should also set it for the puppet. Task-number: QDS-3859 Change-Id: Id88132cebbb7aeddb3fbb8ff1e8aa5191cc89d15 Reviewed-by: Tuomo Pelkonen <tuomo.pelkonen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Add image cacheMarco Bubke2020-10-161-2/+0
| | | | | | | | | | | | 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>
* Remove usages of Core::IdEike Ziller2020-09-211-2/+2
| | | | | | | It moved to Utils. Change-Id: Ia4d12bb07db2d59b1cb084b2ebdea20e6e3b40ad Reviewed-by: hjk <hjk@qt.io>
* Merge remote-tracking branch 'origin/qds-1.59' into 4.13Tim Jenssen2020-08-131-14/+17
|\ | | | | | | Change-Id: Ic720f3adab305c5ef8cd10e713ccabf510eff0c0
| * QmlDesigner: Split messaging and process for puppetsMarco Bubke2020-08-101-14/+17
| | | | | | | | | | | | | | | | | | | | 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>
* | Core/Utils: Migrate further to Utils::Idhjk2020-07-061-1/+1
|/ | | | | | | | 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>
* qml: introduce QmlMultiLanguageAspectTim Jenssen2020-06-181-1/+0
| | | | | | | | | | | | 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>
* qmlpuppet: enable the use of multilanguage databaseTim Jenssen2020-05-261-0/+1
| | | | | Change-Id: I2277348ac1e6b5025e75c640da83da30294c9d10 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Create thumbnail for imported 3D assetsMiikka Heikkinen2020-03-301-2/+4
| | | | | | | | | | | | | | | | | | | | Qmlpuppet now allows creating icon from qml source code. Invoke qmlpuppet with following arguments to create icons: --rendericon <size> <icon file name> <icon qml source> E.g. --rendericon 24 ~/my_icon.png ~/my_icon.qml Two icons are created, one with size x size dimensions and one with double the dimensions and "@2x" injected into the file name. 3D asset import utilizes this icon rendering to produce item library icons for imported components. Change-Id: I92c62c80d961f5f61a0ce1c09b32bbcbf80ea56c Fixes: QDS-1052 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesiger: Use ProjectExplorer::Target instead of Project plus Kithjk2019-10-311-7/+3
| | | | | | | A Target is pretty much exactly that. Change-Id: Icd6041428ecd616906d5fbf74a5b87ea4b5c8103 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: fix to not use not existing puppetsTim Jenssen2018-10-171-1/+1
| | | | | | | | also remove the path if it is the same as the default path Task-number: QTCREATORBUG-21303 Change-Id: I811ffab789c1cfc200aa2c68672ee4d6ee83ecfe Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Remove unnecessary code, add overrides and modernizeTobias Hunger2017-10-131-3/+1
| | | | | Change-Id: Id6751219a2459c1c9673932650c768984f86cb62 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Remove dead code from puppetcreatorTobias Hunger2017-10-131-9/+1
| | | | | Change-Id: I5e648f1083882be7bad87a7fdbccfd2b3c96a9a9 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Use more nullptr in puppetcreatorTobias Hunger2017-10-131-3/+3
| | | | | Change-Id: Ia723b1629c0d5aff49f54dc026efe0f822f2267a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Parse style config file in PuppetCreatorThomas Hartmann2017-01-121-0/+1
| | | | | | | | Since QT_QUICK_CONTROLS_CONF is not supported for older Qt version we manually parse the file and set QT_QUICK_CONTROLS_STYLE. Change-Id: I2f1e4a857adaf80975726af69f136748a3f18930 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: set QT_QUICK_CONTROLS_CONFThomas Hartmann2016-09-281-1/+7
| | | | | | | | | | | | If we have a qtquickcontrols2.conf we set QT_QUICK_CONTROLS_CONF for the qml2puppet. For this we have to forward the project to PuppetCreator. I forwarded the project instead of just the path to qtquickcontrols2.conf, because we most likely add more project specific features in the future. Change-Id: I0a90636ca6903e28499018c8d769bb07f7be5bb6 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: get tests compiling and runningThomas Hartmann2016-06-101-0/+2
| | | | | | | | | | 105 passing, 1 failing, one test seems flaky I skip many nodeinstance/puppet related tests, because the tests/test framework cannot deal with the qml2puppet/emulation layer being out of process. Change-Id: I5b254c7e6e944b8fbd8ba490c1e8bb43d0eb38c3 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Wholesale conversion to #pragma oncehjk2016-03-301-4/+1
| | | | | | | Kudos to cgmb and https://github.com/cgmb/guardonce Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-10/+10
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* QmlDesigner: remove any use QML1 puppet code from the designerTim Jenssen2015-09-291-10/+1
| | | | | Change-Id: I7386cc289cced48c1879778ae9ad0ead7bc50469 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Qt Quick Designer: License change to Qt Commercial + GPLv3Alessandro Portale2015-09-181-12/+7
| | | | | | | | Change-Id: I7f7aecd02892b6c616cd148fa5d845e7bc0d3b4f Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* QmlDesigner: Adding some puppet settingsThomas Hartmann2015-07-171-4/+10
| | | | | Change-Id: I8ba718a7388abab41436afffb5645935b2d52eee Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigenr: Collect qrc urls and create mapping for the qmlpuppetThomas Hartmann2015-07-151-0/+3
| | | | | | | | | | We collect all possible qrc path and the mappings provided by the code model in the TextToModelMerger. Then we set this mapping as environment variable for the puppet in the PuppetCreator(QMLDESIGNER_RC_PATHS). Change-Id: I4b4c7253af23d1f32a75394d04199e76f2e9efdd Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Set QML[2]_IMPORT_PATH evn variable when running qml[2]puppetBogDan Vatra2015-01-231-4/+6
| | | | | | | | qml[2]puppet can't use any QML plugin that are defined in your .pro file (using QML_IMPORT_PATH) unless we don't specify it. Change-Id: I0fffb8a5da1023565fa9fce5cd4cf38f098a0df1 Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* QmlDesigner: Adding useOnlyFallbackPuppet to settingsThomas Hartmann2014-08-051-1/+2
| | | | | Change-Id: Id9e5f71865f50d3f148cd6cd556024d39b03b89a Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner.PuppetCreator: Set qmlpuppet dir as working dirThomas Hartmann2014-08-051-0/+1
| | | | | | | | | Before the working directory was the working directory of Qt Creator. If the working direcotry was the bin diredtory of Qt Creator the puppet picked up the qt.conf from Qt Creator and could not load the platform plugin. Change-Id: Iab22267c578fc837b1b52bded850f0033618811c Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Fix spelling in PuppetCreatorMarco Bubke2014-07-171-7/+7
| | | | | Change-Id: I0acca5762d8263292ad0bd9fdac41fc268049e35 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Check if the puppet source are newer than puppetMarco Bubke2014-07-151-0/+1
| | | | | | | And recompile puppet in that case. Change-Id: Ia19d54aaa83a4b267de515b6eac5d367f943d7c6 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Try to create the puppet only onceMarco Bubke2014-05-211-13/+9
| | | | | | Change-Id: I0a56617b262a97e8b5d8007276ebaa09c8cbe4f6 Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Fix rest of Puppettype -> PuppetTypeNikita Baryshnikov2014-05-201-3/+3
| | | | | Change-Id: Ibebee3e841a0ad723301656d7334dbe45759da96 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QmlDesigner: Fix spellingMarco Bubke2014-05-191-1/+1
| | | | | Change-Id: I3afc07ff07e65e4a0e6fd0f5374722fdc2e5d770 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Reset fallback defaultMarco Bubke2014-04-171-0/+1
| | | | | Change-Id: I188249bc9de3db6a3d650fb27af906374948262a Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner: Check if the Qt installation is updatedMarco Bubke2014-04-171-0/+3
| | | | | | | | We should recompile the puppet if the Qt installation is updated because we use private API. Change-Id: I841f83faa6b3cac11fbb6a8b8d3508006a4f6b2d Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner: Progress dialog for puppet creationMarco Bubke2014-04-091-1/+4
| | | | | Change-Id: I9337fa70af18aca0018c16cf9152f912086330f8 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner: On demand compilation of the puppetMarco Bubke2014-04-091-0/+120
Before we had to provide the puppet in the packaging. Now we compile the puppet on demand so we can be sure it is always there in the right version and working. Task-number: QTCREATORBUG-11763 Change-Id: I8556ef677ed27fbcc8a7775dced60230104e3237 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
View Lorry Controller Status