Also small renames to add clarity.
Fixes: QDS-12998
Change-Id: I1b38fa501bcc606f13675a98c5543709d15ac615
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Some tweaks and refactoring to get rid of ContentLibraryMaterial in the
user section of the content library. The end goal is to unify the code
for handling all Qml components in the user section (materials, 3d
components, effects, 2D components. etc).
Change-Id: I99d4fb64dae0b52265994ce478525e574e4bc658
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Also some relevant tweaks.
Change-Id: I7bace9ce6bd7b45951cc18f7175b4646251196f0
Reviewed-by: Ali Kianian <ali.kianian@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
i.e. when opening a project that has a different import folder style
from the currently open project.
Fixes: QDS-12639
Change-Id: I8d341c38ec771dc5e28c4436cd9ad191e27c38a8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Remove the useless round trip from model to view and back
Change-Id: I38a5826e165014f64d7855139b58e9691b0f6310
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
so that it can be shared by more than 1 bundle. Also some relevant
tweaks.
Change-Id: I421648c26ac4a0d51612f21a5475f0938dfff331
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This used to not build on linux. Doesnt seem the case anymore.
Change-Id: Ia58d388bfe4f5cc794b29f8e25a9a8d6b3f229c3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
after removing a bundle material from project
Fixes: QDS-12527
Change-Id: I72b4d99d15a6fbd454d45bdf0ba1a1b469e1a5bb
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
The only import path should be project root, so change things that
are generated under asset_imports to be generated in new folder
GeneratedComponents under project root. GeneratedComponents is prefixed
to the type names of generated items as well.
If project already contains asset_imports folder, then old location is
used.
Fixes: QDS-12430
Change-Id: I7a419fe1c5411e3d39bf3c1e659df0043c60ba33
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
QFile::exists only calls QFileInfo::exists, so this saves one
function call per invocation.
Change-Id: I41cb407345654eeead14455a4955b8b9b015aedc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
The project storage is using the imports of a document to get the type.
So it is not using qualified types and gets the version from the imports.
After we switch all three methods will be removed.
Task-number: QDS-10266
Change-Id: Ic127a3bb6bd6f559457b3ce6a8631774359259a5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
...instead of resetting the model. This prevents downloading materials
and textures from getting interrupted and is more efficient
performance-wise.
Fixes: QDS-9654
Change-Id: Id15a86c43ba06aa07071229259b9ea163979b619
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
In Preferences, the User can configure the download path for bundles.
However, this configured the path only for the textures, while the
materials kept using the hardcoded path.
Task-number: QDS-9622
Change-Id: Id4ac82f899542eac5c2ce9cc51053113327aef2c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
If internet is down, or, for some reason, the URLs are inaccessible,
then we should still show the existing materials and textures.
Task-number: QDS-9582
Change-Id: Ic9516c7bc00a37d1c3cd31643749f51a217bf317
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
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>
