Commit Graph

14 Commits

Author SHA1 Message Date
Aleksei German
fcab6a10d2 QmlDesigner: Improve project open functions
This patch:
unifies lookup for the first qml file to open;
increases number of possible fallback options;
adds missing implementations to some methods in QmlBuildSystem.

Task-number: QDS-9984
Change-Id: Ib282b1fca8b0564fe80f00e3d9ffe82c1a15c540
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-06-26 09:47:57 +00:00
Aleksei German
96cd0b3668 QmlDesigner: Fix for mainFiles missing filepath
It always returns projectDirectory otherwise

Task-number: QDS-9984
Change-Id: Ia8a7d660eef46ec4e0afd53c1452798f95367dcd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Burak Hancerli <burak.hancerli@qt.io>
2023-06-26 09:47:52 +00:00
Alessandro Portale
50c386b53a Translations: Call Tr::tr() where it should
Change-Id: Ibf2be8a9aabd0a4e8e763a96901feaaa6eda2f3e
Reviewed-by: hjk <hjk@qt.io>
2023-06-09 12:04:26 +00:00
Tim Jenssen
f09598de43 QmlProjectManager: fix import FilePath
Deployment was not working for subdirectories.
Path was not correct in projectInfo.importPaths.maybeInsert.

Change-Id: I4fd8a08ef6182c52963d6d76a700f4687abd9730
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2023-06-07 18:03:05 +00:00
Tim Jenssen
2b4fe0aef8 Qml: fix Boot2Qt deployment from Windows host
- fix QmlBuildSystem::target*() to resolve maybe device files
 - Cache lookup of qml path on device

Task-number: QDS-9994
Change-Id: I5675368368f2d1cc513feb98fdcdd75fda1a764a
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2023-06-07 09:49:30 +00:00
Eike Ziller
edd1a89807 Move SessionManager to Core plugin
Sessions are independent from projects, and this allows for removal of
e.g. the dependency from Bookmarks to ProjectExplorer.

Includes moving the command line arguments (-lastsession, <session>) to
Core plugin.

Change-Id: I6c578fd15c4990902e7196501de20f39376e90e8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-25 11:15:41 +00:00
Christian Stenger
590a6904b1 QmlDesigner: Fix qbs build and building with Qt6.2
Change-Id: Ic114c9eb830eed5cf0bef890007408694453791e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2023-05-23 08:40:09 +00:00
Christian Kandeler
8e7ad13ad2 Fix qbs build
Was broken in an impressive number of ways by latest Design Studio
merge.

Change-Id: I25f56827074a8c16a1a9c18884e1f63e8eaf6ef1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2023-05-23 07:24:49 +00:00
Knud Dollereder
5bf1b598c1 Move mcu deploy step into the mcusupport plugin
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>
2023-05-11 08:50:46 +00:00
Thomas Hartmann
351e11a73d QmlProject: Fix mainUiFilePath()
The method mainUiFilePath() is supposed to return the actual file path
that is relative to the project file.
Removing mainUiFilePath() from QmlProjectItem, since QmlProjectItem
is supposed to contain only the pure data.

Task-number: QDS-9650
Change-Id: Iad474586cad8f8cef745aadb63d421573d7d9c83
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-04-27 14:11:46 +00:00
Burak Hancerli
ccf17b02c8 QmlDesigner: Fix project file getter/setter issues
Task-number: QDS-9781
Change-Id: I2df8cca1c4e5cd10563621b849fb54b29c0d155d
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-04-26 12:55:59 +00:00
Knud Dollereder
3387c68ff2 Add MCU build step to the QmlBuildSystem
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>
2023-04-20 16:51:39 +00:00
Burak Hancerli
69902addf1 QmlProjectManager: Fix the build error coming from -Werror
Change-Id: I46601bcbb9ce358d34211fdea76707abcb5ca709
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-04-06 15:43:33 +00:00
Burak Hancerli
66d72433a6 QmlProject: Refactor QmlProjectManager
- feature: JSON based project manager plugin
- feature: functionality to write QmlProject file
- tests: tests for QmlProjectItem

Task-number: QDS-8810
Change-Id: I8989e54577e9cd883bd76346e22774cc7f7ed93f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2023-04-05 15:13:43 +00:00