aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge commit '549a485bd128f40ce375c8f60d388c2a56861312' from qds/dev"The Qt Project14 days1-0/+1
|\
| * Merge commit '549a485bd128f40ce375c8f60d388c2a56861312' from qds/devhjk14 days1-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '549a485bd128f40ce375c8f60d388c2a56861312': (479 commits) QmlDesigner: Use unqualifiedTypeName directly QmlDesigner: Use StringUtils::split_last in property editor QmlDesigner: Avoid usage of strings for types QmlDesigner: Fix various type issues QmlDesigner: Fix navigator tooltip previews QmlDesigner: Fix the maximum value on shadowMapFar property QmlDesigner: Remove missed full qualification QmlDesigner: Remove duplicate code QmlDesigner: Fix type in filter model QmlDesigner: Fix type names in path tool QmlDesigner: Fix types in timeline QmlDesigner: Refresh meta type for import changes QmlDesigner: Make standaloneApp true by default QmlDesigner: Qt login requires email address on the next login QmlDesigner; Fix tracing in declare type QmlDesigner: More tracing for set type id QmlDesigner: Add missing tracers in model QmlDesigner: Fix refresh of type ids QmlDesigner: Fix fileChanged and directoryLoaded in AssetsLibraryModel GoogleTest: update to v1.17.0 ... Change-Id: I40474de918a2cfd53121b75fb34041fda6fc96a9
| | * Merge remote-tracking branch 'origin/17.0' into qds/devTim Jenssen2025-08-301-35/+130
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed Conflicts: doc/qtcreator/src/user-interface/creator-ui.qdoc qt_attributions.json src/libs/utils/filesystemwatcher.cpp src/libs/utils/filesystemwatcher.h src/libs/utils/ranges.h src/plugins/coreplugin/dialogs/settingsdialog.cpp src/plugins/effectcomposer/effectshaderscodeeditor.h src/plugins/extrapropertyeditormanager/extrapropertyeditormanagerplugin.cpp src/plugins/mcusupport/mcusupportplugin.cpp src/plugins/multipropertyeditor/MultiPropertyEditor.json.in src/plugins/multipropertyeditor/multipropertyeditorplugin.h src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp src/plugins/qmldesigner/components/componentcore/bundleimporter.cpp src/plugins/qmldesigner/components/componentcore/modelnodeoperations.cpp src/plugins/qmldesigner/components/contentlibrary/contentlibraryusermodel.cpp src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp src/plugins/qmldesigner/components/formeditor/formeditorscene.h src/plugins/qmldesigner/components/integration/designdocument.cpp src/plugins/qmldesigner/components/propertyeditor/gradientpresetitem.cpp src/plugins/qmldesigner/imagecachecollectors/imagecachecollector.cpp src/plugins/qmldesigner/libs/designercore/designercoreutils/modelutils.cpp src/plugins/qmldesigner/libs/designercore/designercoreutils/stylesheetmerger.cpp src/plugins/qmldesigner/libs/designercore/projectstorage/projectstorage.cpp src/plugins/qmldesigner/libs/designsystem/dsstore.cpp src/plugins/qmldesigner/puppetenvironmentbuilder.cpp src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp src/plugins/qmldesignerbase/utils/qmlpuppetpaths.cpp src/plugins/qmldesignerbase/utils/qmlpuppetpaths.h src/plugins/qmlprojectmanager/buildsystem/qmlbuildsystem.cpp src/plugins/qmlprojectmanager/qmlproject.cpp src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp tests/unit/tests/printers/gtest-creator-printing.cpp Change-Id: I0410606167e4685aa826462e8294e9ef3e452c65
| | * | QmlDesigner: Add option to create a qml module with the "Add New" menuKnud Dollereder2025-07-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I284b2be4817f106a55b8969ba8214d0fe84f0ad2 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Andrii Semkiv <andrii.semkiv@qt.io>
* | | | Design mode: Add identifiers for sub-modesEike Ziller14 days1-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes them identifiable. Api: Core::DesignMode::registerDesignWidget takes an additional Id argument Change-Id: I1969a6de5e588825a720aa709777ef8a1075ae9e Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io> Reviewed-by: hjk <hjk@qt.io>
* | | QmlProjectManager: Remove unused isQtDesignStudioStartedFromQthjk2025-11-041-1/+3
| | | | | | | | | | | | | | | Change-Id: I99f03514bc41113dcea745413de4e3949fca1572 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
* | | Remove code guarded by ICore::isQtDesignStudio()hjk2025-10-281-121/+0
| | | | | | | | | | | | | | | | | | | | | | | | It won't be used anymore. Change-Id: Ia3aefa417ff94cbeb60bd9cc3afed0f7d6734917 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | Utils: Add ParentFilePaths rangeMarcus Tillmanns2025-08-071-1/+1
| | | | | | | | | | | | | | | Change-Id: I9ab9a829b452ecdd38ec3dfe811dec00bb907c9f Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | | Utils: Add convenience functionality for traveling up the FS hierarchyChristian Kandeler2025-08-061-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | This is a common operation, e.g. for locating config files. No need to rewrite the loop every single time. Change-Id: I31c3649852d82a24104ec1665fceec3a6073051f Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
* | | ProjectExplorer: Set id for all run worker factoriesJarek Kobus2025-06-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | And print the id of conflicting factories in testConflict(). Amends 3c242cd497d51b95a882d25a684cf3aadb04b81d Change-Id: Ibf3e9764246a2226cd7563c2268df83c23fd532c Reviewed-by: hjk <hjk@qt.io>
* | | Add an UpdateInfo::Service and use it for a Install QDS buttonEike Ziller2025-06-111-13/+19
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds an Update/Installer API that other plugins can use to trigger installation of a Qt Online Installer component. The API takes a component name/regex. It opens the dialog and uses the headless Qt IFW commands to - finds components matching the pattern - shows the user details on which components are available, or if none are available - asks the user if they should be installed - installs the components (showing the installer output) The "Install QDS button" is available if Qt Design Studio is not found, and uses the new API to allow the user to install it, without the need to manually open MaintenanceTool, finding the right component, etc. Fixes: QTCREATORBUG-30787 Change-Id: I590bb557c93373bcc73ab70524720b00c05763e5 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Core: Return Result<> from IEditorFactory::startEditor()hjk2025-04-161-2/+2
| | | | | | | | | | Change-Id: Ibca35716497ea62e92957db115130a841aff360a Reviewed-by: David Schulz <david.schulz@qt.io>
* | QmlProject: Add a toolbutton for opening .ui.qml file in QDSEike Ziller2025-03-311-10/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a tool button to the text editor for .ui.qml files. A global action is added too, that the user can assign a keyboard shortcut to. Also adds a setting for configuring Qt Design Studio to the QML/JS Editing settings, that is only shown if QmlProjectManager makes it visible when QmlDesigner is not enabled. The setting defaults to the QDS that is installed alongside Qt Creator, but the user can point it to an installation, e.g. if QDS is installed through other sources, or QtC is not from an online installer. Most importantly, the setting is a place where this can be explained to the user. This setting is also used for the Design mode landing page and the Open with > Qt Design Studio functionality. Fixes: QTCREATORBUG-31005 Change-Id: I86fbe205a4079e8d1192051eec3e38701d3c1dc0 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | ExtensionSystem: Remove uses of PluginManager::plugins()Marcus Tillmanns2025-03-281-11/+2
| | | | | | | | | | | | | | | | Replaces various custom iterations of PluginManager::plugins() with PluginManager::specById / specExists / specExistsAndIsEnabled Change-Id: I08d6892aec4c3a467dcb64eeabcc3a6d97739b64 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/16.0'Eike Ziller2025-03-271-20/+18
|\| | | | | | | Change-Id: Ibac8bd0e35b19207f8aa4697aa5d9d797b15a7ee
| * QmlProject: Allow opening individual .ui.qml files in "lite" QDSEike Ziller2025-03-251-20/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDS nowadays provides an option "-qml-lite-designer" that starts it in a "lite" mode. When opening QDS from Qt Creator, use the "normal" QDS when a .qmlproject file is found. Otherwise start it with "-qml-lite-designer". Switches to Process::startDetached with "-client" and "-qml-lite- designer" on macOS too, since "open" wouldn't work for instance sharing depending on the "-qml-lite-designer" option that we can do with the "- client" option. Task-number: QTCREATORBUG-31005 Change-Id: Ia9e00e0ed5ecad8c3c383ee46a6fd2594ee7b2e7 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlProjectManager: Simplify RunWorkerFactory subclassesJarek Kobus2025-03-211-6/+2
| | | | | | | | | | Change-Id: I0af5c86cefa91f874b0239a8177078e618d2b335 Reviewed-by: hjk <hjk@qt.io>
* | QmlProjectManager: Hide SimplePreviewRunnerFactoryJarek Kobus2025-03-211-3/+13
| | | | | | | | | | | | | | | | Move it from QmlPreview into QmlProjectManager and hide in cpp, as it's only used there. Change-Id: Ia39c3f73139fc6938689adc789391fead96dcf4a Reviewed-by: hjk <hjk@qt.io>
* | QmlProjectManager: Hide SimpleQmlProfilerRunnerFactoryJarek Kobus2025-03-211-3/+13
| | | | | | | | | | | | | | | | Move it from QmlProfiler into QmlProjectManager and hide in cpp, as it's only used there. Change-Id: Ibad65ee83e71788cc010857f0790aca93cf78dcd Reviewed-by: hjk <hjk@qt.io>
* | ProjectExplorer: Allow to retrieve project-specific kit issuesChristian Kandeler2025-02-171-7/+47
| | | | | | | | | | | | | | | | | | | | ... without a Project object. Otherwise, we cannot show these issues in the wizard's target setup page, which is an annoying inconsistency. Task-number: QTCREATORBUG-32490 Change-Id: I1b654961ad92c44f7219af5c06fab773834b2667 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QmlProjectManager: Add build configurations to QmlProjectsChristian Kandeler2025-02-051-0/+2
|/ | | | | | | | As per our new convention. Should not result in any user-visible changes. Change-Id: I229e328236c62aa530a58d2f212ff5adf82a6531 Reviewed-by: hjk <hjk@qt.io>
* ProjectExplorer: Add and make use of forwarding accessors in ProjectChristian Kandeler2025-01-201-8/+2
| | | | | | | | | Most accesses to activeTarget() are for getting to the active kit or build/deploy/run configuration. Simplify client code by adding convenience functions for that. No functional changes intended. Change-Id: Ide266712d19f960e4512672eb3bd00fc4d21b47b Reviewed-by: hjk <hjk@qt.io>
* Utils: Rename FilePath::toString() into toUrlishString()hjk2025-01-101-3/+3
| | | | | | | | | | | | | | | | toString() is almost always the wrong conversion, but unfortunately too easy to find and often even working at least for local setup. This here raises the bar as the non-availability of the "obvious" toString() hopefully helps people to think about the semantics of the needed conversion and choose the right toXXX() function. The chosen new name is intentional ugly to reduce the likelihood that this (still almost always wrong) function is used out of convenience. Change-Id: I57f1618dd95ef2629d7d978688d130275e096c0f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* PE: Rename SimpleTargetRunner into ProcessRunnerJarek Kobus2025-01-061-1/+1
| | | | | Change-Id: Ie666fe0811aa63c54edf12934c6db4e17b26c252 Reviewed-by: hjk <hjk@qt.io>
* Plugins: Change a few usages of PluginSpec::name to ::idAlessandro Portale2024-11-221-1/+1
| | | | | | | | | | | | | First, PluginSpec had only field "name". QtC 15 added "id", which became (a lowercase) copy of "name", and which is the future-proof field to use when identifying a plugin. This change turns usages of PluginSpec::name, which are not exclusively used for user display into PluginSpec::id. In case of id string comparisons, the plugin id string turns to lowercase. Change-Id: Ibae3b06a932158cd6946e1b29192b1db0dd78a40 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
* Merge remote-tracking branch 'origin/qds/dev'Tim Jenssen2024-09-251-3/+24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add QWidget include in src/plugins/qmldesigner/libs/designercore/model/model.cpp prepare src/plugins/lua/CMakeLists.txt if lua plugin is not built Necessary change in: src/plugins/qmldesigner/components/toolbar/messagemodel.h Because Utils::Id is a friend of qHash now, QtCreator API removed uniqueIdentifier(). std::unordered_map<quintptr, ProjectExplorer::TaskCategory> -> QHash<Utils::Id, ProjectExplorer::TaskCategory> m_categories = {}; other resolved Conflicts were in: cmake/QtCreatorAPI.cmake cmake/QtCreatorAPIInternal.cmake share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/DirectoryFontLoader.qml.tpl share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json src/plugins/effectcomposer/effectcomposerview.cpp src/plugins/effectcomposer/effectcomposerwidget.cpp src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.cpp src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp src/plugins/qmldesigner/components/contentlibrary/contentlibrarywidget.cpp src/plugins/qmldesigner/components/edit3d/edit3dview.cpp src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp src/plugins/qmldesigner/designmodecontext.cpp src/plugins/qmldesigner/designmodewidget.cpp src/plugins/qmldesigner/qmldesignerplugin.cpp src/plugins/qmlprojectmanager/buildsystem/projectitem/converters.cpp src/plugins/qmlprojectmanager/qmlprojectmanager.qbs src/plugins/studiowelcome/examplecheckout.h Change-Id: Ia6c204460baf4de886e45666d859ca048d578bcb
| * QmlProject: Delay the opening of the fake projectThomas Hartmann2024-08-291-4/+10
| | | | | | | | | | | | | | | | | | | | There are cases e.g. when restarting QDS when the correct .qmlproject will be opened anyway. Task-number: QDS-13495 Change-Id: I04e13d148484c3afa8e08fe2a43eb700c615720a Reviewed-by: Burak Hancerli <burak.hancerli@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlProject: Open a fake project if a single .ui.qml file is openedThomas Hartmann2024-08-271-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If a single ui.qml file is opened in Qt Design Studio we open a fake project that includes the folder of the opened ui.qml file. If a .ui.qml file is opened and no project is opened in Qt Design Studio we open a "fake" project with the specific name, that provides a default. We can later extend this to supporting import paths and other advanced features. Task-number: QDS-13171 Change-Id: Icecb669d7149c4850da7dd908e9b3e1619d74c7d Reviewed-by: Burak Hancerli <burak.hancerli@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * Add PythonGenerator to simplify DS to Python workflowKnud Dollereder2024-08-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is now a new Menu entry: "Export Project"->"Enable Python Generator". When checked it will create a simple Python file that can be used as starting point for python development. Alternatively one can also use the qmlproject variable "enablePythonGeneration" to enable the python generator. also, took the opportunity to refactor the code. - Improved names from the original implementation. (cmakegen -> QmlProjectExporter) - Bundled the cmake generator and the python generator in one class Exporter. - Moved common functionality of both generators into one base class (FileGenerator). Change-Id: Ie5948a115148ee1ddce78d827d5ce4498ea5d558 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlProjectManager: Remove DesignModeContexthjk2024-07-041-3/+1
|/ | | | | | | This sets no context, i.e. effectively does not do anything. Change-Id: I5f2e30f61fd5547f71cd69a43667c21ea4d06c77 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QML: Add an "external" editor for opening .ui.qml files in Design StudioEike Ziller2024-05-061-5/+21
| | | | | | | | | | | | | Using the logic from the landing page in design mode. Users can select Qt Design Studio from the Open With... menu, or even set it as the default editor in Preferences > Environment > MIME Types, "application/x-qt.ui+qml" Task-number: QTCREATORBUG-30754 Change-Id: Idd4e688f722dcf38735db7c1b9b31af02caeb045 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* QmlProjectManager: Remove old cmake generatorKnud Dollereder2024-04-191-6/+1
| | | | | | | | | and suppress warnings about .hints files not being part of the project Fixes: QDS-12507 Fixes: QDS-12508 Change-Id: If3c2f5ce716b8744dd4fee91ec7bba5293163a97 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlProjectManager: New project structure support for CMakeGeneratorKnud Dollereder2024-03-281-0/+2
| | | | | | | | | | | | | | | | | | - Add writer interface in order to support the current and the new project structure in parallel. Using the new one if qdsVersion is >= 4.5 - Separated templates for the new generator from the old one - Add file name validity check - Generate files in the folder src and cmake if they do not exist yet. Only re-generate files in src/autogen. - Add action to enable or disable the cmake-generator - Add function that checks if a resource file is within the project folder but not part of the project Change-Id: I3d75dbee1043ed28e6126cf0b2c83994cb70ed45 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Utils: Fix build with MSVC with C++20Eike Ziller2024-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | Rename process.h back to qtcprocess.h MSVC's "threads" standard header includes <process.h>, and that ends up including our process.h from Utils. There already was a hacky workaround in place for a similar issue with MINGW, but that doesn't work with MSVC because that doesn't have Simply use a name that doesn't conflict. Change-Id: I1159cd2096b4f2dbc4a1728d0131dd6edd30ebd3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io> (cherry picked from commit 5af531cd39067366cea627e3db1a0b83d7172873) Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Create RunConfiguration specific QmlPreviewWorkerFactoriesDominik Holland2024-02-011-0/+4
| | | | | | | | | | | | Instead of relying on the QmlPreviewRunWorkerFactory to match for all RunConfiguration, every plugin needs to create a WorkerFactory for its own RunConfiguration. Similar to the SimpleTargetRunnerFactory there is now a SimpleQmlPreviewRunnerFactory which makes the setup easy. Change-Id: I350e5a047033a259dae91045486d4f41e7f58994 Reviewed-by: hjk <hjk@qt.io>
* QmlProjectPlugin: Dissolve QmlProjectPluginPrivatehjk2024-01-181-31/+27
| | | | | | | Not really used anymore. Change-Id: I125ca6573cb0fd56cc925379dc0e97b0564e1b7c Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* QmlProjectManager: Merge the two *constants filehjk2024-01-181-1/+0
| | | | | | | The reason for the split is unknown, maybe just an accident. Change-Id: I4fadd003ee2e6f8d91ed9494bd2304b2d35eff81 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* QmlProjectManager: Use setup pattern for QmlProjectRunConfigurationhjk2024-01-181-1/+2
| | | | | Change-Id: Ib69a09c65a4755312663286fddbd891c4f7c49ce Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* QmlProjectManager: Delay construction of some run worker factorieshjk2024-01-181-3/+10
| | | | | | | ... until the base factories are there. Change-Id: I0b3541c32eb7f7bbc24461a0fc9c1be85fc4f29b Reviewed-by: Dominik Holland <dominik.holland@qt.io>
* Create RunConfiguration specific QmlProfilerWorkerFactoriesDominik Holland2024-01-171-0/+4
| | | | | | | | | | | | Instead of relying on the QmlProfilerRunWorkerFactory to match for all RunConfiguration, every plugin needs to create a WorkerFactory for its own RunConfiguration. Similar to the SimpleTargetRunnerFactory there is now a SimpleQmlProfilerRunnerFactory which makes the setup easy. Change-Id: I504ca5afe232cb4e3aa0bb0b67271637a7e7a9d0 Reviewed-by: hjk <hjk@qt.io>
* Create RunConfiguration specific DebugWorkerFactoriesDominik Holland2024-01-171-0/+4
| | | | | | | | | | | | Instead of relying on the DebuggerRunWorkerFactory to match for all RunConfiguration, every plugin needs to create a WorkerFactory for its own RunConfiguration. Similar to the SimpleTargetRunnerFactory there is now a SimpleDebugRunnerFactory which makes the setup easy. Change-Id: I25aaabcd70f7ac649baeab4eb4c7e88d53dac91e Reviewed-by: hjk <hjk@qt.io>
* QmlProjectManager: Hide plugin class in .cpphjk2024-01-161-14/+37
| | | | | Change-Id: If9ed1c00c53f127ba328f5011772431b5e5b25f9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* QmlProjectManager: Cleanup qmlprojectplugin.cpphjk2024-01-161-63/+60
| | | | | | | ... in preparation of moving the plugin class. Change-Id: I449439f8db0a1c74dde51bf33a6f0e01fbc2a727 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Utils/all: Move mime constants into a central placehjk2023-11-081-2/+3
| | | | | | | | They are reasonably standardized, and generally usable cross-plugin, so this can help to avoid a few cross-plugin compiletime dependencies. Change-Id: Icb2b010c3e12dee69df54ab16f6f8e90d9cffba6 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/qds/dev' into 12.0Tim Jenssen2023-10-051-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qmldesigner/connectionseditor/SuggestionPopup.qml share/qtcreator/themes/dark.creatortheme share/qtcreator/themes/default.creatortheme share/qtcreator/themes/flat-dark.creatortheme share/qtcreator/themes/flat-light.creatortheme share/qtcreator/themes/flat.creatortheme src/libs/utils/CMakeLists.txt src/plugins/CMakeLists.txt src/plugins/qmlprojectmanager/qmlproject.cpp src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp Change-Id: Idd87c281e1aa7b7fd2702473ad55e18563cbfb21
| * Core: add ICore::isQtDesignStudio()Tim Jenssen2023-10-041-2/+2
| | | | | | | | | | | | Change-Id: I3aed97b62abd05b283ac327be210af75f173383d Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Utils, all: Standardize on QtcSettingshjk2023-09-271-2/+4
|/ | | | | Change-Id: Id222016f15b1c3bfe6710fe5d0297666d4565ef1 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
* Merge remote-tracking branch 'origin/qds/dev'Tim Jenssen2023-05-221-1/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/instructions/build.yaml doc/qtcreator/src/projects/creator-only/creator-projects-creating.qdoc share/qtcreator/qmldesigner/studio_templates/projects/common/CMakeLists.main.txt.tpl src/libs/CMakeLists.txt src/libs/advanceddockingsystem/dockmanager.cpp src/libs/advanceddockingsystem/workspacedialog.cpp src/plugins/coreplugin/manhattanstyle.cpp src/plugins/qmldesigner/CMakeLists.txt src/plugins/qmldesigner/components/formeditor/toolbox.cpp src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp src/plugins/qmldesigner/components/toolbar/toolbarbackend.cpp src/plugins/qmldesigner/designercore/projectstorage/qmltypesparser.h src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp src/plugins/qmldesignerbase/qmldesignerbaseplugin.cpp src/plugins/qmldesignerbase/qmldesignerbaseplugin.h src/plugins/qmlprojectmanager/qmlproject.cpp src/tools/qml2puppet/CMakeLists.txt tests/unit/unittest/CMakeLists.txt Change-Id: I2c5f18c4fca49471d02713ce5859032232cf7756
| * Move mcu deploy step into the mcusupport pluginKnud Dollereder2023-05-111-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This deploy step will run the qmlprojectexporter commandline tool on the currently active qmlproject if qtForMCUs is set to true. The output of the tool is shown in the "Compile Output" panel. Possible configuration issues are shown in the "Issues" panel. Note that the step is not removed from the list but disabled when setting qtForMCUs to false in order to retain possible changes made by the user. Change-Id: I03b0d6fbe420b49400d48e7365d4395491b9aa2d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: hjk <hjk@qt.io>
| * Add MCU build step to the QmlBuildSystemKnud Dollereder2023-04-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | If a qml project is marked as qtForMCU the buildstep will run the qmlprojectexporter on the currently active qmlproject when pressing the "Run" button. The output messages of the tool will then show up in the "Compile Output" panel. The build step itself can be seen when switching to "Projects" mode under "Deployment". Change-Id: I5ac31d5655e3b4b6137aaf541839776f144a09c4 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>