summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprojectmanager
Commit message (Collapse)AuthorAgeFilesLines
* Utils: Rename qtcprocess.{cpp,h} -> process.{cpp,h}Jarek Kobus2023-05-043-3/+3
| | | | | | | | Follows QtcProcess -> Process rename. Change-Id: I97235a9a40cb7fd52944515b7ab878d96528f919 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Utils: Rename QtcProcess -> ProcessJarek Kobus2023-05-041-2/+2
| | | | | | | | Task-number: QTCREATORBUG-29102 Change-Id: Ibc264f9db6a32206e4097766ee3f7d0b35225a5c 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>
* Layouting: Make aspects operate on parent items, not LayoutBuilderhjk2023-05-032-3/+3
| | | | | | | LayoutBuilder is meant to be an implementation detail nowadays. Change-Id: I777ab934d3d405873e819eeddd27428d8c652f9a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Utils: Make Layouting a top level namespacehjk2023-04-251-1/+1
| | | | | | | | | | The whole machinery is now almost only layoutbuilder.{h,cpp}, mostly independent of the rest of Utils. Idea is to finish the separation to make it stand-alone usable also outside creator. Change-Id: I958aa667d17ae26b21209f22412309c5307a579c Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Fix Qbs buildChristian Stenger2023-03-311-0/+1
| | | | | Change-Id: Ia46cadd346561c2d52596290e3fbabcc2e746229 Reviewed-by: David Schulz <david.schulz@qt.io>
* Merge remote-tracking branch 'origin/qds/dev'Tim Jenssen2023-03-306-38/+84
|\ | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/filepath.cpp src/plugins/qmldesigner/qmldesignerexternaldependencies.cpp src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp tests/unit/unittest/CMakeLists.txt Change-Id: I017a6075db41a5233487ac855ffe23de2b2bb0ee
| * Merge remote-tracking branch 'origin/10.0' into qds/devTim Jenßen2023-03-2645-341/+290
| |\ | | | | | | | | | | | | | | | | | | | | | bigger conflicts resolved at: src/plugins/qmldesigner/CMakeLists.txt src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
| * | QmlDesigner: Always try to open in design mode if qmlproject is openedThomas Hartmann2023-03-222-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there is no ui.qml file then fallback to .qml. Change to design mode in any case if a file was opened. Task-number: QDS-9460 Change-Id: I619292019105f488ff33e6e5ed4294b36eb2627c 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> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * | QmlDesigner: Fix re-opening project errorHenning Gruendl2023-02-221-2/+12
| | | | | | | | | | | | | | | | | | Task-number: QDS-9242 Change-Id: Iecd0271014d2f3e3ea8b3cb13271c2cf4a612ce8 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | QmlDesigner: Stop on every warningMarco Bubke2023-02-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | We already had some bugs because warnings were ignored. So we generate errors now for the qml desinger plugins. Task-number: QDS-9135 Change-Id: I9276a1b5cdbec554bc33c0c6ed3706817518f39c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * | QmlDesigner: Set object names on QQuickViewsThomas Hartmann2023-02-081-0/+2
| | | | | | | | | | | | | | | | | | Change-Id: Icf2af2967a89b62e3328f7d523b8fc46f580314e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * | qmlprojectmanager: fix Cannot run Qt5 projectsTim Jenssen2023-02-081-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | qml2puppet only enables the qmlruntime feature if it was built against a Qt 6. Task-number: QDS-9088 Change-Id: If573cae305ef18c11101a591e6c1e38f133b7914 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| * | QmlProjectManager: Disable Cmake Generation for Qt4MCUBurak Hancerli2023-02-081-29/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QDS-7442 Change-Id: Ifc2239d5be7489e0fd7c5a778e5653d4266c0393 Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| * | QmlDesigner: Share QmlPuppetPathsMarco Bubke2023-02-072-51/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | It removes the workaround in QmlProjectRunConfiguration. Task-number: QDS-8915 Change-Id: I319cdf976980b616eb28cabb40dd63416d7e27fa Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * | QmlDesigner: get qmlPuppetPath by duplicating settingsTim Jenssen2023-01-251-1/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should be a temporary solution. Read settings at two different code locations is error prone. Idea is to introduce a general QmlDesignerUtilsLib which can handle that. Change-Id: Ic670d2c63f134ba8f1b1455d000b7c2f372b1d61 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| * | Merge remote-tracking branch 'origin/9.0' into qds/devTim Jenssen2023-01-122-1/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp Change-Id: Idc7be1f8871df51f7372ea66f81178cfe3e68846
| * | | QmlProjectManager: Fix starting .qmlproject on Boot2Qthjk2022-12-192-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "qmlscene" is called "qml" nowadays. Also give device settings more priority to cover cases where there is no Qt build setup at all. For this case, also demote the missing Qt build version from "Error" to "Warning". Task-number: QTCREATORBUG-28074 Change-Id: Ic44d2bee1965493925d21317d12d5c1f66ace88b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | | | ProjectExplorer: Move some not-fully-session related bitshjk2023-03-018-27/+29
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... out of SessionManager. The idea is to later move SessionManager into the Core plugin, which both is sensible conceptually and also prerequisite to merge the Bookmark plugin into TextEditor plugin. Currently, only the interface is split, as the load/save implemetations are non-mechanical to disentangle. Change-Id: I31631db3094ea192825a2ccaa6add6188662940b Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | | Translations: Change translation context prefix from "::" to "QtC::"Alessandro Portale2023-02-102-2/+2
| | | | | | | | | | | | | | | | | | | | | lupdate would be confused by translation contexts starting with :: Change-Id: Ie95e73436fd3cafc80a8e89f908efadc747e644c Reviewed-by: hjk <hjk@qt.io>
* | | QmlProjectManager: FilePathify furtherhjk2023-01-315-60/+57
| | | | | | | | | | | | | | | | | | | | | Change-Id: I8d83cc93778f8786c30e0aaef459c51005139b19 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | | Utils: Flatten LayoutBuilder related hierarchieshjk2023-01-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Originally the idea was to only expose LayoutBuilder, but we are getting more and more related items. Be consequent now, and have everything in Utils::Layouting, but not in nested classes. Change-Id: Ic0f98595882e5c60a25c30ec52df4a0ea79bc0ca Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | | Use simpler Plugin::initialize() when feasiblehjk2023-01-202-6/+2
| | | | | | | | | | | | | | | Change-Id: I567965d266f20526bda9f823e31a04b354d53fb1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | QmlProjectManager: Tr::trAlessandro Portale2023-01-1914-120/+89
| | | | | | | | | | | | | | | Change-Id: I219111bab487ad5f2d7d1cd7ae6f3e3e8a2a8d3f Reviewed-by: hjk <hjk@qt.io>
* | | Prefix Tr::tr contexts with ::hjk2023-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | To make outliers better visible in Linguist Change-Id: Ic35ea2a858b7e3576d9a416fb494fddb616eaaa1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | Merge remote-tracking branch 'origin/9.0'Eike Ziller2023-01-132-1/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: src/libs/utils/pathchooser.cpp src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp Change-Id: I7ae3f91618c4a4ccb088679caea72b2a81590960
| * | qmlproject: fix qmlViewerAspectTim Jenssen2023-01-122-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add its own settings key so it gets saved into the project settings - read the correct placeholder text, commandLineGetter is set too late and would also create a loop (qmlViewerAspect is used to get it) Change-Id: Iee3458cfe84e3f6b6750aa14d9d89347da21b37c Reviewed-by: Burak Hancerli <burak.hancerli@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | | ProjectExplorer: Introduce and use convenience factory classhjk2023-01-101-7/+3
| | | | | | | | | | | | | | | | | | | | | ... to create SimpleTargetRunner runners for a single run config. Change-Id: I8af3d7cdcaf54f0584af948aa6e0fa015d1a3077 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | | Utils: Rename most FilePath::{from,to}Variant uses to {from,to}Settingshjk2023-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Specifies the main purpose more clearly. The remaining ones a "true" (internal) variants in models and as action data. Change-Id: I8dd3c846e419f29d88283c2f48268ef6685b19fe Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | Replace GPL-3.0 with GPL-3.0-onlyKai Köhne2023-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GPL-3.0 is deprecated by SPDX. Change done by find . -type f -exec perl -pi -e 's/LicenseRef-Qt-Commercial OR GPL-3.0(?!-)/LicenseRef-Qt-Commercial OR GPL-3.0-only/g' {} \; Change-Id: If316a498e3f27d2030b86d4e7743b3237ce09939 Reviewed-by: Lucie Gerard <lucie.gerard@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | Remove GPL-3.0+ from license identifiersKai Köhne2023-01-0643-43/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0, this applies only to a hypothetical newer version of GPL, that doesn't exist yet. If such a version emerges, we can still decide to relicense... While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only Change was done by running find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \; Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | CMake build: Use version-less Qt targetsEike Ziller2023-01-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since we do not support Qt < 5.15 anymore, and as a first step for getting rid of our special FindQt5.cmake. Change-Id: Icc5dbaf9b0a3a622b1f609ff114b9decb6d2856c Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* | | plugins: Remove foreach usageArtem Sokolovskii2022-12-201-1/+2
| | | | | | | | | | | | | | | | | | | | | Change-Id: Idf60caed3b5f4ec4c6e990a9e3188487bcc824f8 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | QmlProjectManager: Re-organize fallbacks for runtime searchhjk2022-12-191-18/+14
| | | | | | | | | | | | | | | | | | | | | | | | This was getting messy. Change-Id: Idce960b393fa02c5a032bb3a0c93929604d77f17 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | | QmlProjectManager: Even more FilePath usehjk2022-12-194-21/+29
| | | | | | | | | | | | | | | | | | Change-Id: I4990b9171598d7f277f8e8e5a2b3e0fb1a3375d0 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | | QmlProjectManager: Fix starting .qmlproject on Boot2Qthjk2022-12-192-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "qmlscene" is called "qml" nowadays. Also give device settings more priority to cover cases where there is no Qt build setup at all. For this case, also demote the missing Qt build version from "Error" to "Warning". Task-number: QTCREATORBUG-28074 Change-Id: Ic44d2bee1965493925d21317d12d5c1f66ace88b Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | | QmlProjectManager: More FilePath usehjk2022-12-151-47/+38
| | | | | | | | | | | | | | | Change-Id: I7af611bdeffb8f06c5f014224c0b6c639a1d8a6d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | | Merge remote-tracking branch 'origin/qds/dev'Tim Jenssen2022-12-143-10/+28
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.cpp Change-Id: Ieda6242b845387100022b08251283891fb0fbda7
| * | QmlDesigner: Add new menu for export actionsThomas Hartmann2022-11-303-10/+28
| | | | | | | | | | | | | | | | | | Task-number: QDS-8092 Change-Id: If83ea84fded27485c50865e49d8d184fecc6d454 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * | QmlProjectManager: Use a PathChooser for the fallback qmlscenehjk2022-11-301-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows to browse for binaries on the target instead of having to specify a proper fully qualified remote path manually. Change-Id: Iaf9dc5c4fe921a7188ef2178f10403fa01e69d03 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> (cherry picked from commit 50f6afe4d0a8d152bcab7b5fa3c7b7583a9cfa3c) Reviewed-by: hjk <hjk@qt.io>
| * | Merge remote-tracking branch 'origin/9.0' into qds/devTim Jenssen2022-11-241-1/+7
| |\ \ | | |/ | | | | | | Change-Id: I5e66666644fd16de60a0158e5e884706622ae3ba
* | | QmlProjectManager: Support running on RemoteLinuxhjk2022-12-141-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a per-device qml run time path and enables X11 forwarding via a run configuration aspect. Task-number: QTCREATORBUG-28074 Change-Id: Iae5e724f44dba876d7a12443b3b89f85cd28f3df Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | | Utils: Remove FilePath::operator+()hjk2022-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was a alias for .stringAppended(), but can be used too easily when .pathAppended() is meant. Change-Id: Ia3b64d39828d4074b43d87c923ce3a6a87038948 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | | QmlProjectManager: Use a PathChooser for the fallback qmlscenehjk2022-11-291-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Allows to browse for binaries on the target instead of having to specify a proper fully qualified remote path manually. Change-Id: Iaf9dc5c4fe921a7188ef2178f10403fa01e69d03 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | Merge remote-tracking branch 'origin/9.0'Eike Ziller2022-11-211-1/+7
|\ \ \ | | |/ | |/| | | | Change-Id: Idd9c2b1bf787040b7b415b7cda29035227ca1011
| * | QmlProject: Check if .qmlproject file does existThomas Hartmann2022-11-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QDS-7434 Change-Id: I3e6717dbab47fd9e5c9fb84c4131ac2f88984cd8 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | | Remove unused includes of QLayoutJarek Kobus2022-11-181-1/+0
| |/ |/| | | | | | | Change-Id: I12777e07f3d6fcc639b48f02080e73b1a0a3ea30 Reviewed-by: hjk <hjk@qt.io>
* | Merge remote-tracking branch 'origin/9.0' into qds/devTim Jenssen2022-11-091-2/+3
|\ \ | |/ | | | | Change-Id: I02fd6f492c27d85b88af7ec8bc18ff62f2c6ed14
| * QmlJS: Fix Follow under cursorMarcus Tillmanns2022-11-081-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to jump to a symbol in a qml file the Qml Model may find the location in a generated .qml file in the build folder. QtCreator searches in all generated .qrc files to try and find the source file so it can jump to it instead. Previously not all auto-generated ".rcc" folders would be found as only the folders of targets (executables) were searched. Plugins or Static Libraries were not searched. With this fix, all projects nodes are searched for the ".rcc" folder and therefore also finds them for Dynamic / Static libraries and plugins. Fixes: QTCREATORBUG-27173 Change-Id: Ic51ac8fbc82c15785cbefd76787942a512ecf3db Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: hjk <hjk@qt.io>
* | Merge remote-tracking branch 'origin/9.0' into qds/devTim Jenssen2022-11-031-3/+12
|\ \ | |/ | | | | Change-Id: I5f72661f1fc54ff861e2cbbaa4cb32f867924c3b
| * Merge remote-tracking branch 'origin/8.0' into 9.0Eike Ziller2022-11-011-3/+12
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/qtcreator/src/qtquick/qt-design-viewer.qdoc src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp src/plugins/qmldesigner/components/navigator/choosefrompropertylistdialog.cpp src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp src/plugins/qmldesigner/designercore/model/abstractview.cpp src/plugins/qmldesigner/designercore/model/import.cpp src/plugins/qmldesigner/designercore/model/model_p.h src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp src/plugins/qmlprojectmanager/qmlproject.cpp Change-Id: I4236bf0da9306abf201f4679259e72dd7c1eddbe
View Lorry Controller Status