summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprojectmanager/cmakegen
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/qds/dev'Tim Jenssen2023-03-301-29/+34
|\ | | | | | | | | | | | | | | | | 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-2614-87/+49
| |\ | | | | | | | | | | | | | | | | | | | | | bigger conflicts resolved at: src/plugins/qmldesigner/CMakeLists.txt src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
| * | 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>
* | | ProjectExplorer: Move some not-fully-session related bitshjk2023-03-012-16/+18
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ... 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>
* | QmlProjectManager: Tr::trAlessandro Portale2023-01-195-72/+35
| | | | | | | | | | Change-Id: I219111bab487ad5f2d7d1cd7ae6f3e3e8a2a8d3f Reviewed-by: hjk <hjk@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-0613-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/qds/dev'Tim Jenssen2022-12-142-10/+24
|\ \ | |/ | | | | | | | | | | | | 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-302-10/+24
| | | | | | | | | | | | Task-number: QDS-8092 Change-Id: If83ea84fded27485c50865e49d8d184fecc6d454 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Remove unused includes of QLayoutJarek Kobus2022-11-181-1/+0
|/ | | | | Change-Id: I12777e07f3d6fcc639b48f02080e73b1a0a3ea30 Reviewed-by: hjk <hjk@qt.io>
* Get rid of unneeded includes of RunControlJarek Kobus2022-10-251-1/+0
| | | | | | | | | | Removed also some other includes that were marked with yellow triangles. In some cases includes of runcontrol.h were substituted with other includes, like qtcassert.h. Change-Id: Ica40f68198c7f8f70e6047acb2eddc8ef017e43d Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Utils: Rename FilePath::relativePath() to relativePathFrom()hjk2022-10-181-1/+1
| | | | | | | Hopefully less confusion about the direction. Change-Id: I61727d6c4d19e0dfe46f24ff24f5d90f9835d05c Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Remove outdated version checksRobert Löhning2022-09-121-4/+0
| | | | | | Change-Id: I972a7fe0842a0310ba5df1233a4f417627dad87c Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* CMake: Replace PathChooser::path() uses by filePath()hjk2022-09-061-3/+2
| | | | | Change-Id: Id375c83d7b038bcf2af95318df0b5a04290edbaf Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Utils: Replace PathChooser::{fileP,p}athChanged signalshjk2022-09-061-5/+3
| | | | | | | | | | | | | | | | | ... by a new PathChooser::textChanged signal. They were both emitted in reaction to the underlying line edit's textChanged() signal. Use 'textChanged()' as name to mimic/match the Qt side. This also makes it more clear on the user code side, when this happens. Some textChanged() consumers should probably use editingFinished() instead, but that's left for later changes. Change-Id: Ib07347f616cbf1c5d09bc2f8671ca860d185d1f9 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlProjectManager: Replace a use of PathChooser::setPathhjk2022-09-051-1/+1
| | | | | | | | ... by setFilePath Change-Id: I1842ec8f5b4d308e5447069ca88f5130b637a1fe Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Use SPDX license identifiersLucie Gérard2022-08-2614-340/+28
| | | | | | | | | 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>
* QmlProject: Disable or hide qmlproject related actionsThomas Hartmann2022-07-201-4/+7
| | | | | | | | | | | | Generate CMake Build files is only relevant for .qmlprojects and should only be enabled for those. Export as latest Project Format is only relevant for QDS and should be hidden in Qt Creator. Task-number: QTCREATORBUG-27935 Change-Id: Iac6ca6927443a92dfb501f76c855fd641aaf10da Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlProjectPlugin: Don't leak action on shutdownJarek Kobus2022-06-294-6/+6
| | | | | | | | Detected by memory analyzer. Change-Id: I5c1ba80e9a1e1ca620b496ebe6cd9bb600e8b800 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Move CMake generator to QmlProjectManagerTapani Mattila2022-05-1922-0/+2438
Task-number: QDS-6898 Change-Id: Ib1ca2ff4cd17a1ee6c203878a963bf44bac6969b Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
View Lorry Controller Status