summaryrefslogtreecommitdiff
path: root/src/tools/qml2puppet
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/qds/dev'Tim Jenssen2023-03-3010-20/+164
|\ | | | | | | | | | | | | | | | | 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
| * QmlDesigner: Fix typo in anchors property namesMahmoud Badri2023-03-291-2/+7
| | | | | | | | | | Change-Id: Ibb100babdc1d98bd0c75bda11ac3b184efb0e480 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Do not complete Connections in the puppetThomas Hartmann2023-03-271-1/+9
| | | | | | | | | | | | | | | | | | | | This is not required and does crash with Qt 6.5. Calling component complete on Connections is not required, since they should not be active in the puppet anyway. Task-number: QDS-9533 Change-Id: I686b99adb2d888b7df53e5f7da14a2e0a5d147e7 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * Merge remote-tracking branch 'origin/10.0' into qds/devTim Jenßen2023-03-26184-581/+298
| |\ | | | | | | | | | | | | | | | | | | | | | bigger conflicts resolved at: src/plugins/qmldesigner/CMakeLists.txt src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
| * | Use QString::toUpper instead of std::toupperKnud Dollereder2023-03-241-4/+4
| | | | | | | | | | | | | | | | | | Change-Id: I83fd40b9ac2ec8d47078c226390f5b352d4bf9bb Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | crashpad: change chrashpad dumps location to user directory on macOSTim Jenssen2023-03-062-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary to not pollute the signed and notarized .app bundle. Task-number: QDS-9113 Change-Id: I74e0bced5679faac94b27d2a31ea10a7949fb21f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * | qml2puppet: fix QtCreator branded buildsTim Jenssen2023-03-031-1/+3
| | | | | | | | | | | | | | | | | | Task-number: QDS-9356 Change-Id: I6bb587a8a5c0d7d905725b1e145fcc9c11ac4994 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * | qml2puppet: add application iconTim Jenssen2023-02-282-2/+56
| | | | | | | | | | | | | | | | | | Task-number: QDS-694 Change-Id: Id8f75d34d81645e9d4ceccff25e57afb658f8777 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * | QmlPuppet: fix enable preview in release buildsTim Jenssen2023-01-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since qmlpuppet is also used as QML runtime for the preview QML debug channel this should be enabled in every build. Change-Id: I0f9c10f1adf24f3db7da2389aa8a72e14b25433d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * | QmlDesigner: Switch to basestate before setting expression in stateThomas Hartmann2023-01-231-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When setting an expression in a state then the revert list is not properly managed. Therefore we have to temporarily enter the basestate to set the expression. Task-number: QDS-7801 Change-Id: I4f653e83db4a2d05b1cc0b67d22581cee84557ff Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * | QmlDesigner: Work around the issue in QtQuick3D 6.4 geometry cachingMiikka Heikkinen2023-01-231-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuick3DGeometry::updateSpatialNode can create QSSGRenderGeometry object with exact same address as a previously created and subsequently deleted QSSGRenderGeometry object (i.e. the memory location is reused). If the previous node was not used for the exact same logical geometry, then you get these artifacts, as QSSGBufferManager uses QSSGRenderGeometry object pointers in QSSGBufferManager::loadRenderMesh function to determine if it needs to reload the geometry and what geometry gets used for each model. The cache still contains data for the deleted node, which is then matched for the new node with same address. This workaround ensures that none of our selection box geometries will have the same generation id with each other or any grid geometries we create, and thus will never get improperly matched in QSSGBufferManager cache. Fixes: QDS-8843 Change-Id: Ib064e4c290cca37258e8f129b0f385d2c45f581e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
| * | qmlpuppet: better error when Qt is too oldTim Jenssen2023-01-191-6/+13
| | | | | | | | | | | | | | | | | | Change-Id: I219f2f8ce551e36d2f749d60a6984c3ccc903e5c Reviewed-by: Burak Hancerli <burak.hancerli@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | | qml2puppet: Don't always recompile qml2puppetMarcus Tillmanns2023-03-133-50/+63
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | Whenever cmake runs, the app_version.h of qml2puppet is recreated. This was included almost everywhere so a complete rebuild of qml2puppet would be triggered. This patch moves the app_version.h include into a single .cpp to limit how much of qml2puppet needs to be recompiled. Fixes: QTCREATORBUG-28784 Change-Id: I5064d450ed92ec003f164bcd42be694612011196 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | qml2puppet: Don't rely on FindQt5.cmakeEike Ziller2023-01-251-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the normal CMake mechanism for finding either Qt 5 or Qt 6, instead of relying of the mapping from Qt 6 to Qt 5 that is done via the custom FindQt5.cmake. As long as FindQt5.cmake still exists, we better assume that Qt5_VERSION could be >= 6.0.0 though. Change-Id: I3d095208e1608da46fe81d4db166aa0cd99c7326 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/qds/dev'Eike Ziller2023-01-126-25/+91
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/updateinfo/updateinfoplugin.cpp Change-Id: Ie1bf2ad434f0224fb91caf91b443daae3d5b5ec0
| * QmlDesigner: Fix value types in property editorHenning Gruendl2023-01-112-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the value types of e.g. layer.textureSize and layer.sourceRect are only resolved for QML Item, but not QML Control. This patch increases the recursion depth while collecting the attributes of values types in order to be able to set layer.textureSize.width or layer.sourceRect.x. It also adds those attributes to be able to read the values. Change-Id: I61ba1468d1443953f0a5b6ab2241114dc441bb79 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * QmlDesigner: Fix rotation block property name in puppetMiikka Heikkinen2023-01-101-1/+1
| | | | | | | | | | | | | | | | Property name was changed on creator side when aux property handling was refactored, but corresponding change was not done in puppet. Change-Id: Iba21661908d6c46d7f586c18f0d34fcece597c9a Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * QmlDesigner: fix for coreApp initialization problem and loadwatcher scope ↵Burak Hancerli2023-01-052-12/+12
| | | | | | | | | | | | | | | | | | failure Change-Id: I7a82cdd32757a7d37a0e88fad3e0f83527e49094 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Fix resizeToItem with live previewThomas Hartmann2023-01-041-10/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | The live preview recreates the "containedObject" and reparents it to the window. But the containedObject was not tracking this. Now we track the children accordingly. Using bindings to keep the size in sync. Change-Id: I051e9621f150befffec548ae0bbd431bd18480ce Reviewed-by: Burak Hancerli <burak.hancerli@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Replace GPL-3.0 with GPL-3.0-onlyKai Köhne2023-01-10182-182/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Fix SPDX-License-Identifier to be on one lineKai Köhne2023-01-062-4/+2
| | | | | | | | | | | | | | | | | | | | To be able to be processed by tools, SPDX-License-Identifier expressions cannot be split across lines. See also E.4.4 in https://spdx.github.io/spdx-spec/v2.3-RC1/using-SPDX-short-identifiers-in-source-files/ Change-Id: I44d95cb2de44f53fdcaa745068e2df7e8e9767b3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | CMake build: Use version-less Qt targetsEike Ziller2023-01-051-11/+11
| | | | | | | | | | | | | | | | | | 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>
* | qmlpuppet: Fix build with Qt 5Eike Ziller2023-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The API uses QVector, which is a QList in Qt 6, which is why assigning a QVector to a QList works "fine" there. But with Qt 5 we must use the correct type. Also assign to a const variable. Otherwise this actually forces a detach. Amends 9321c6ad24042a256ac44d28e5263e45f0fb4a16 Change-Id: Ied562b96d647435ae48395ae08cc12a5670ac607 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/qds/dev'Tim Jenssen2022-12-2222-306/+1177
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp src/plugins/updateinfo/updateinfoplugin.cpp src/tools/qml2puppet/CMakeLists.txt src/tools/qml2puppet/qml2puppet/instances/qt5rendernodeinstanceserver.cpp Change-Id: I6b65ce2d603453fcebc2291574d55db80853f247
| * qmlpuppet: fix standalone buildTim Jenssen2022-12-211-0/+4
| | | | | | | | | | | | Change-Id: I0a7da757e78a68f65163d4e383323d34a5b70670 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * qmlpuppet: add .tag reading for GIT_SHATim Jenssen2022-12-211-0/+5
| | | | | | | | | | Change-Id: I29f0663b9bbc6f68c7f802fa8fef4b12e091ee61 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * qmlpuppet: fix include if crashpad is enabledTim Jenssen2022-12-212-9/+6
| | | | | | | | | | | | | | | | | | #include <windows.h> should come after #define NOMINMAX not sure why it was necessary as an explicit include it should come by the crashpad includes Change-Id: I53ccdd893e9d8e5d5fadd46f5a5f5c0c21af0cc5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * qmlpuppet: fix Qt5 buildsTim Jenssen2022-12-2111-27/+27
| | | | | | | | | | | | Change-Id: Ie3fedef867bf2327b145b4ef4e5b282858076b23 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * qmlpuppet: fix crashpad buildTim Jenssen2022-12-212-8/+9
| | | | | | | | | | | | Change-Id: I02f5abce80d4ccc1ea711e1dcb01946d53f8b5a7 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * qmlpuppet: fix buildHenning Gruendl2022-12-202-4/+3
| | | | | | | | | | | | | | | | amends last commit Change-Id: I057912c49526d386707b893227f16410297d7b18 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * qmlpuppet: fix standalone buildTim Jenssen2022-12-201-0/+4
| | | | | | | | | | | | | | | | | | app_version.h is not generated and found if a build just for the qml2puppet target is requested Change-Id: I9ef164d8e0c698d43eae74d2522029f9eff0f397 Reviewed-by: Burak Hancerli <burak.hancerli@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
| * QmlDesigner: Extract asset type stuff from the AssetsLibraryModelSamuel Ghinet2022-12-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | This is in preparation for the task that will show metadata of assets. The functions for checking the asset type have little to nothing to do with the model. This change will also clean up the code a bit. Task-number: QDS-8177 Change-Id: Ibab28f5b63228f626f517a59e2442d2718c2fc07 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Fix state preview rendering with multiple View3DsMiikka Heikkinen2022-12-191-15/+28
| | | | | | | | | | | | | | | | | | | | | | | | Multiple View3Ds with shared resources such as materials don't always properly dirty themselves when a shared resource changes. Work around this issue by rendering the base state twice if there are multiple View3Ds. Fixes: QDS-8618 Change-Id: I3840a082ff8e55557afe5a5f139382d82cd6b184 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Fix cancel button not reverting background colorSamuel Ghinet2022-12-162-17/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the 3D view, when the user experiments with different background colors, but then decides to cancel, upon pressing the Cancel button and closing the dialog, the last color picked remained set. This happened on Qt6.4 and not on Qt6.3. The reason for this was the usage of Array.isArray() on an object exposed from C++ to QML of type QVariant that could hold either a QList<QColor> or a a QColor. It looks like there is no supported way from qml/js to see if a variable is a list / sequence or a scalar. So the best way would be to always work with QList<QColor> even though in most cases only one single QColor is being used. Task-number: QDS-8143 Change-Id: Ia7e8e1facad24439ad244305c213bb12e286105b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * QmlDesigner: Ensure all View3Ds are rendered when one isMiikka Heikkinen2022-12-163-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If View3Ds share resources such as materials, changing such shared resource doesn't in all cases make all using View3Ds dirty until one of the views is rendered. For purposes of rendering 2D view, this is too late, as we determine the list of items to render before any is rendered. Fixed the issue by ensuring all View3D items in the scene are added to the list of items to render if any of them are added to that list. Fixes: QDS-8346 Change-Id: Ib18ce0d37978857efdb67e15976e1fecdc1b6c96 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: add support for multiple qml backendsBurak Hancerli2022-12-1616-268/+1087
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch includes; * Fork of original QML runtime as an alternative QML backend for QDS * Flexible structure for adding/removing different types of QML interpreters Note: When forking the original QML the config.h is renamed as qmlconfiguration.h because it was clashing with sqlite and QmlRuntime.QmlConfiguration uses "magic" name matching. QmlConfiguration/qmlconfiguration is unlikely to conflict with anything. Task-number: QDS-8373 Change-Id: Ifaa1b766c717ce12d6b3c9ddbbc0665669797e36 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | qml2puppet: Remove foreach usageArtem Sokolovskii2022-12-219-42/+58
| | | | | | | | | | | | | | Change-Id: I00af71e640a46962f987f7eb7d360f04d68f23ea Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io>
* | qml2puppet: allow Qt Creator build without QtQuickCristian Adam2022-12-191-17/+17
| | | | | | | | | | | | | | | | | | Only require the full dependencies for a standalone build of qml2puppet. Change-Id: I2a158b36fa674db6d655b753afe205f419c0a113 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* | Qml2Puppet: Fix configuration when qml2puppet is disabledCristian Adam2022-12-191-2/+2
| | | | | | | | | | | | | | | | | | | | Setting a property on a non existing target is a no go. The changed done in 5b6bf2914382696176ad664b7548dee1fd44f239 got somehow removed by 036948c6286cc01d8e3bbf0e594dc0bc5358e43b Change-Id: Id6d09b27817fa2c1f2c2c13127994710f5a2981a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/qds/dev'Tim Jenssen2022-12-1410-19/+71
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/assetslibrary/assetslibrarymodel.cpp src/plugins/qmldesigner/components/contentlibrary/contentlibrarytexturesmodel.cpp Change-Id: Ieda6242b845387100022b08251283891fb0fbda7
| * QmlDesigner: Adjust for scene root transform when finding click posMiikka Heikkinen2022-12-131-0/+4
| | | | | | | | | | | | Fixes: QDS-8590 Change-Id: I0b8a604c4f78f57a64f4720ab676745c5d0db980 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * QmlDesigner: Work around the issue in QtQuick3D 6.4 geometry cachingMiikka Heikkinen2022-12-082-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuick3DGeometry::updateSpatialNode can create QSSGRenderGeometry object with exact same address as a previously created and subsequently deleted QSSGRenderGeometry object (i.e. the memory location is reused). If the previous node was not used for the exact same logical geometry, then you get these artifacts, as QSSGBufferManager uses QSSGRenderGeometry object pointers in QSSGBufferManager::loadRenderMesh function to determine if it needs to reload the geometry and what geometry gets used for each model. The cache still contains data for the deleted node, which is then matched for the new node with same address. This workaround ensures that none of our grid geometries will have the same generation id and thus will never get improperly matched in QSSGBufferManager cache. Task-number: QDS-8516 Change-Id: I017a4ae4a59eef2bb26ade5abf13e8f74f57c4af Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * QmlDesigner: QtObject is in QML nowThomas Hartmann2022-12-021-1/+9
| | | | | | | | | | | | | | | | | | | | If a type cannot be created we created a QtObject instead. Since we create Item for items this crash was rare. Task-number: QDS-8460 Change-Id: Ifd80f6670bec5328ddd122e0f2f2c133c487b3bd Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
| * QmlDesigner: initialize unique pointerThomas Hartmann2022-11-301-0/+1
| | | | | | | | | | | | | | | | | | This crashes with Qt 5. With Qt 6 this "worked", which was most likely pure luck. Change-Id: I652b190ae0d4b00adb4c48e601e7be9512f86d16 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * qml2puppet: fix include when building against linux Qt5Tim Jenssen2022-11-291-0/+2
| | | | | | | | | | Change-Id: I17401443a1e099b9c63d0de2e6f8bf5c3e9cfcb3 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * qml2puppet: remove unnecessary flexibilityTim Jenssen2022-11-291-6/+2
| | | | | | | | | | | | | | | | | | standalone builds are doing: cmake --install . --prefix <something_with_bin> Change-Id: I61c0743c00f96c0505e2fa383e4bee41c2b6ceb9 Reviewed-by: Burak Hancerli <burak.hancerli@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * qml2puppet: qt5 puppet fixesTim Jenssen2022-11-223-10/+18
| | | | | | | | | | Change-Id: I2fd809c6646944b06b497f0587178e2dcd92c4a1 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | CMake: Add a preset for a minimal CMake configurationCristian Adam2022-11-281-4/+6
| | | | | | | | | | | | | | | | | | | | | | This "cmake-plugin-minimal" preset contains the set of plugins that I usually need to build to be able to test the CMakeProjectManager plugin. Change-Id: I8bb02879df38c40be38c4a2bf4e85e0623f2dca5 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | qbs build: Don't build qml2puppetChristian Kandeler2022-11-171-307/+2
|/ | | | | | | | Amends a0f356aed6795b09091472eaaed9872b6abc5514. Change-Id: Icb8a9b5e6163df79534f552e2dc84dade2bf5753 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QmlDesigner: Fix shaking items when scrubbing the timelineThomas Hartmann2022-11-161-1/+3
| | | | | | | | | | | | | | | The reason for this is that when scrubbing the timeline, the bounding rectangle can change a lot (See bugreport). If this is the case the pixmap and the bounding rectangle get temporarily out of sync, which leads to the shaking. In this patch we add the bounding rectangle to the pixmap command. The bounding rectangle coming with the pixmap has higher precedence. This means if there is a pixmap, then the pixmap is always in sync with the pixmap. If there is no pixmap we use the "original" bounding rectangle. Task-number: QDS-7828 Change-Id: I40c0b7ed97863b9dca726547927ae1a37f9c415d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
View Lorry Controller Status