Commit Graph

14 Commits

Author SHA1 Message Date
Tim Jenssen
002d84cb15 Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts: src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
  src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
  tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
  tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp

Change-Id: I257f1908917bcc58805619b53b6866f2f73ca544
2023-06-02 19:26:05 +00:00
Thomas Hartmann
547f719631 QmlProject: Add trace point to qmlproject
We use the qmldesignerplugin, if the qmldesigner plugin
is disabled then nothing is traced.

Task-number: QDS-10010
Change-Id: Ifa7f7719efca6a757e69b75937368d7a69a5e460
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-01 16:46:58 +00:00
Tim Jenssen
adb664f521 Merge remote-tracking branch 'origin/qds/dev'
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
2023-03-30 13:30:42 +00:00
Tim Jenßen
feabda3aa7 Merge remote-tracking branch 'origin/10.0' into qds/dev
bigger conflicts resolved at:
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
2023-03-26 16:26:18 +02:00
hjk
3e7d93c788 ProjectExplorer: Move some not-fully-session related bits
... 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>
2023-03-01 09:26:50 +00:00
Burak Hancerli
5ac46d46ba QmlProjectManager: Disable Cmake Generation for Qt4MCU
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>
2023-02-08 15:46:37 +00:00
Alessandro Portale
0fff2aa172 QmlProjectManager: Tr::tr
Change-Id: I219111bab487ad5f2d7d1cd7ae6f3e3e8a2a8d3f
Reviewed-by: hjk <hjk@qt.io>
2023-01-19 15:53:58 +00:00
Kai Köhne
56baf8c058 Remove GPL-3.0+ from license identifiers
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>
2023-01-06 11:15:13 +00:00
Thomas Hartmann
7e03b29bc7 QmlDesigner: Add new menu for export actions
Task-number: QDS-8092
Change-Id: If83ea84fded27485c50865e49d8d184fecc6d454
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-11-30 17:16:12 +00:00
Jarek Kobus
866a658b42 Get rid of unneeded includes of RunControl
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>
2022-10-25 09:49:13 +00:00
Lucie Gérard
a7956df3ca Use SPDX license identifiers
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>
2022-08-26 12:27:18 +00:00
Thomas Hartmann
e1b0ba2473 QmlProject: Disable or hide qmlproject related actions
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>
2022-07-20 09:50:15 +00:00
Jarek Kobus
a0de1f1848 QmlProjectPlugin: Don't leak action on shutdown
Detected by memory analyzer.

Change-Id: I5c1ba80e9a1e1ca620b496ebe6cd9bb600e8b800
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-06-29 10:09:56 +00:00
Tapani Mattila
6b6bdd52a7 QmlDesigner: Move CMake generator to QmlProjectManager
Task-number: QDS-6898
Change-Id: Ib1ca2ff4cd17a1ee6c203878a963bf44bac6969b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-05-19 09:59:50 +00:00