summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: Remove exceptionqds/v3.6.0qds-3.6Thomas Hartmann2022-08-261-4/+0
| | | | | Change-Id: I06e0ab93d06ca1f60bfc99e1f9def34e17854585 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Change default material preview env to studio envMiikka Heikkinen2022-08-263-12/+14
| | | | | | | | | | | Since "Default" option is no longer default, it was changed to "Basic" Change-Id: I8654efbd98fe62f6c4817141fc8559757f5e58e8 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> (cherry picked from commit 3e17d8eed406ad1fecdee26d9276e1d007c0c0ea) Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix crashThomas Hartmann2022-08-241-1/+2
| | | | | | | | Tracking the target with a QPointer in case the target gets deleted. Change-Id: I9cca4a5017b7fc77941fd46653847a00363c060e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Render state previews for StateGroupThomas Hartmann2022-08-241-7/+17
| | | | | | | | | Render previews for all state groups in the document. Change-Id: I89d9c43a53eb3d9844b863278395fd9098a07772 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QmlDesigner: Add NodeInstanceServer::allGroupStateInstances()Thomas Hartmann2022-08-242-0/+17
| | | | | | Change-Id: I26b20976746c3790d679a63db209fb535eb58382 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QmlDesigner: Implement ObjectNodeInstance::stateInstances() for StateGroupThomas Hartmann2022-08-241-1/+15
| | | | | Change-Id: Ia6e239530d399da34ab63253762e3ebd2a79f4db Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
* QmlDesigner: Do not set state property on QQuickStateGroupThomas Hartmann2022-08-241-0/+4
| | | | | | | | The state is determined by the state view. Change-Id: I3b76b25c618d4f860f13d2e005d88d93a660fbc0 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QmlDesigner: Always skip when conditionThomas Hartmann2022-08-241-2/+1
| | | | | | | | There is no reason to set the when condition ever. Change-Id: I4c6b5ca04cdb7ba62f833225c6878da83a02abaf Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* QmlDesigner: Ignore properties when making document as modifiedThomas Hartmann2022-08-241-0/+3
| | | | | | Change-Id: I659fc3e035c4b98500e700779e4e2a2627a18eb2 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlJS: Fix compileChristian Stenger2022-08-241-0/+1
| | | | | | | Amends 8310a2f0a9a4d. Change-Id: I062a377c9d6f1993f23c5b7e56cca93ad6c3eac5 Reviewed-by: David Schulz <david.schulz@qt.io>
* StudioWelcome: Fix QTC_ASSERTThomas Hartmann2022-08-231-1/+1
| | | | | | | | | Deleting QtcProcess instance directly from one of its signal handlers will lead to crash. Change-Id: Ida231f29dc6a717dfe4971da9743b1fb9b225495 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* QmlDesigner: Fix crashThomas Hartmann2022-08-231-5/+7
| | | | | | | isBlocked seems to be called in rare cases if the model is null. Change-Id: Ie8fa6007a0891f4204c35600084025ca52f079e9 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* qmljs: reduce used threadsTim Jenssen2022-08-233-7/+22
| | | | | | Change-Id: I8f27037d0cfefd65f1ac060e1505328ea705a670 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Tests: Do not use config mode when searching for Eigen3Christian Stenger2022-08-231-2/+2
| | | | | Change-Id: I144481821267b80404473d821ac1048ff3adeac3 Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* clangd: Use QtC system environment for environment variablesCristian Adam2022-08-231-1/+3
| | | | | | | | | | | Users would set QTC_CLANGD_COMPLETION_RESULTS in the Qt Creator system environment variable dialog and expect that clangd would the be configured with the corresponding --limit-results value. Task-number: QTCREATORBUG-28071 Change-Id: Ia7a9b6a96fabe7ba16906c547a15716f0b83f0ec Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* StudioWelcome: Fix QTC_ASSERTThomas Hartmann2022-08-231-1/+1
| | | | | | | | | | | Deleting QtcProcess instance directly from one of its signal handlers will lead to crash! I cannot confirm this crash actually happened, but we should play save and delete the archive from the event loop. Change-Id: Ie27291c9ac8b300478ed8396d25a76b343f238be Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Do not assume that the active state group is the root nodeThomas Hartmann2022-08-231-9/+18
| | | | | | | Change-Id: Ifd315a7e1d8c833f612e305127911634174a8e5b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
* QmlDesigner: use stateGroup() instead of hard coding the root nodeThomas Hartmann2022-08-231-3/+3
| | | | | | | Change-Id: I502c51f252fb8584c36a2bbd31faa7a130d19f5e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
* QmlDesigner: Do not require visual node for statesThomas Hartmann2022-08-231-3/+0
| | | | | | | | StateGroup is no visual node. Change-Id: Ia0ff297efe2b73f42eb24e193d8e832250d77237 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
* QmlDesigner: Use QmlObjectNode instead of QmlVisualNodeThomas Hartmann2022-08-231-1/+1
| | | | | | | | StateGroups are no visual items. Change-Id: Ia081c303aea6c79c750b44388a81f4b10cc1837d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
* QmlDesigner: Move QmlVisualNode::states to QmlObjectNodeThomas Hartmann2022-08-234-10/+10
| | | | | | | | This is required for StateGroup support. Change-Id: I25d8f94c2a0fa9140ce8af3032bc92a7b858b9d8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
* Doc: Fix arguments to start debugging Qt Quick applicationsLeena Miettinen2022-08-231-2/+2
| | | | | | | | A dash was missing. Fixes: QTCREATORBUG-28093 Change-Id: Ic7fbf8fda8d23fdc1eabf98b53240824a24aacc5 Reviewed-by: hjk <hjk@qt.io>
* Doc: Add commas and fix style issuesLeena Miettinen2022-08-231-7/+8
| | | | | Change-Id: I10d1e11c5981704b5ae5e7690f3df036af9873b3 Reviewed-by: hjk <hjk@qt.io>
* QmlDesigner: Fix compileChristian Stenger2022-08-232-2/+1
| | | | | Change-Id: Iab57aa9b78c73773ccdb66490ff2536b2a5465fd Reviewed-by: David Schulz <david.schulz@qt.io>
* Doc: update remote CDB setup instructionsDavid Schulz2022-08-221-4/+4
| | | | | | | | | Mention the dependencies of the cdbextension and instruct to copy the full folder instead of just the dll. Fixes: QTCREATORBUG-27914 Change-Id: If14d331af66437bc8723fc16fc72354cccd4e0d6 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Add zoom slider to the curve editors toolbarKnud Dollereder2022-08-2211-65/+40
| | | | | | | | | | | Removed the "Set Default" button from the toolbar since it does the same as the "linear interpolation" button and space is rare in the toolbar. Fixes: QDS-6951 Change-Id: Ifdbf20af2e5365e9bf9b592783b872394cabb7eb Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Aleksei German <aleksei.german@qt.io>
* Update qbs submodule to HEAD of 1.23 branchIvan Komissarov2022-08-221-0/+0
| | | | | | | Change-Id: I053b24ae7b03226de7bf1ffaf9d5424f123c620e Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* QmlDesigner: Create a context menu for the 3D EditorMahmoud Badri2022-08-229-35/+111
| | | | | | | | | | | For now only 1 action is implemented (edit material), more actions are coming next. Task-number: QDS-7414 Task-number: QDS-7398 Change-Id: Id8e36c23d9a4d35ee94d55d3d6b15df78241a05d Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* QmlDesigner: Fix propertyGroups.json warning for 2D projectsMahmoud Badri2022-08-224-6/+21
| | | | | | | Load property groups file only if Quick3D import exists Change-Id: Idf7b95cb4efa34dde6196964e5e2cbad54341193 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* ScxmlEditor: Fix build with Qt5Christian Stenger2022-08-221-3/+3
| | | | | Change-Id: I09609ac62604885f7800088619cbe1f4ea510d83 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* StudioWelcome: Move plugin to "Utilities" categoryEike Ziller2022-08-221-1/+0
| | | | | | | | | | | People regularly report that they somehow got this plugin enabled in Qt Creator, and one reason could be that they just enabled all plugins in the "Qt Quick" category (e.g. by clicking the checkbox for that category). Separate this plugin from the group. Task-number: QDS-7449 Change-Id: I0a6e7ee7bc1a59cb2cd2fc28bc037fc62e184315 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* ScxmlEditor: Fix a crash when closing scxml editorJarek Kobus2022-08-222-5/+9
| | | | | | | | | | | | | | | Don't iterate on m_overlappedItems inside d'tor, as every iteration calls removeOverlappingItem() and it modifies the container being iterated. Do the same for m_outputTransitions and m_inputTransitions. Amends 8b444f88eb6cf37fcfbae8ae8d7388a43fcb78fb Fixes: QTCREATORBUG-28027 Change-Id: I78fe67b5ea584c969e4850a2db3f00d981296865 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Artem Sokolovskii <artem.sokolovskii@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* StudioWelcome: Scale down splash screen if it does not fitThomas Hartmann2022-08-192-7/+12
| | | | | | | | | | If the splash screen does not fit on the screen we have to scale it down. Task-number: QDS-7449 Change-Id: I73018563e9f863d3a8f60facf7599590fb602f0f Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
* StudioWelcome: Only disable welcome screen if download is startedThomas Hartmann2022-08-191-2/+0
| | | | | | Task-number: QDS-7448 Change-Id: Ic239ba4e5ff4549642cbcb38ab823331dee64308 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Merge remote-tracking branch 'origin/7.0' into 8.0Eike Ziller2022-08-192-18/+32
|\ | | | | | | Change-Id: I183c69e40aa36be6140c732d097a03bb5b2b3c5d
| * QmlDesigner: Fix some more license headersEike Ziller2022-08-192-18/+32
| | | | | | | | | | | | | | Change-Id: I19419745ce79a339875e92e86d7e599a8c2ddeb0 Reviewed-by: Lucie Gerard <lucie.gerard@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | Doc: Update info on how to get BridgesMats Honkamaa2022-08-194-16/+14
| | | | | | | | | | | | | | | | | | Qt Bridges are nowadays avaialble in the QDS enterprise license. Task-number: QDS-7356 Change-Id: Iec78d8879698462292626c413bfc0810e68c40b7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Fix debug compilation errorHenning Gruendl2022-08-181-4/+4
| | | | | | | | | | | | | | | | In WelcomeMode accidentally the wrong widget was used. Fix by replacing m_modeWidget (QWidget) with m_quickWidget (QQuickWidget). Change-Id: Ie04dc3a2cc843ee4d430c3cefba6c48697c6046f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Implement copying specific material properties sectionMahmoud Badri2022-08-184-26/+147
| | | | | | | | | | | | | | Change-Id: I34bed00c89018e86941c4e5a7ddeae44c06f850d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | QmlDesigner: Recreate QuickWidget on downloadThomas Hartmann2022-08-181-47/+67
| | | | | | | | | | | | | | | | | | Instead of resetting the engine we have to recreate the widget to avoid a crashes. Task-number: QDS-7355 Change-Id: Id0d202c5da1d13433a95442156815056168b998b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Exclude Behavior children from SceneAleksei German2022-08-181-1/+13
| | | | | | | | | | | | Task-number: QDS-7444 Change-Id: I6bd04f7619ae15d2fce81d79d1a1c59e33e834c8 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | StudioWelcome: Disable welcome page during downloadThomas Hartmann2022-08-183-5/+23
| | | | | | | | | | | | Change-Id: Ic85dfd79e4c43822805ce2a7f392f9b0a5d2a923 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | Bump version to 8.0.2Eike Ziller2022-08-183-6/+6
| | | | | | | | | | | | Change-Id: Ib7e45eb039bcba4430259babbd3d398258f62c5c Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: David Schulz <david.schulz@qt.io>
* | Do not update control values when pressing cancelKnud Dollereder2022-08-183-4/+4
| | | | | | | | | | Change-Id: I3d365e760fa8ba4a0b36a995d0bf6a59f2d9734b Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | LanguageClient: correctly disconnect documents changed signal on resetDavid Schulz2022-08-181-10/+21
| | | | | | | | | | | | | | | | | | | | | | connect calls to a lambda can not be disconnected with the sender->disconnect(receiver); syntax, so save the connection in a QMetaObject::Connection and use this to disconnect the signal. Fixes: QTCREATORBUG-27596 Change-Id: I69f5d990aab4e85d768e2101f0157a7dee3c1fa1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | QmlDesigner: Block preview data change handling when initializingMiikka Heikkinen2022-08-182-2/+5
| | | | | | | | | | | | | | | | | | | | | | Handling the data change is pointless when we are initializing UI to stored values, and can also trigger undesirable secondary effects like showing color selection dialog. Fixes: QDS-7415 Change-Id: I0321c47d5a63971dc890c37f90ec6fedc8293eca Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* | QmlDesigner: Add support for component materialsMiikka Heikkinen2022-08-188-24/+223
| | | | | | | | | | | | | | | | | | | | Component materials can now be seen on material browser and their properties are properly shown on material editor Fixes: QDS-7390 Change-Id: I3f7edfe655bdb0da1fa71739c825d09d6101c386 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | QmlDesigner: Add scene root material support to material editor/browserMiikka Heikkinen2022-08-1812-81/+116
| | | | | | | | | | | | | | | | | | | | | | If the scene root item is Material subclass, material library is not created for the scene. Material editor and browser functionalities that relate to having material library are disabled. Material editor will always show the material that is the scene root. Fixes: QDS-7374 Change-Id: Icd1c212c17b59e4a2caa6b3b4d7e615e68b21eb9 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | QmlDesigner: Implement copy/paste material propertiesMahmoud Badri2022-08-184-21/+111
| | | | | | | | | | | | | | | | Fixes: QDS-7014 Change-Id: I2a8b779f97de353836a4d506b715720b490c349f Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | QmlDesigner: Fix qbs buildChristian Stenger2022-08-181-1/+0
| | | | | | | | | | Change-Id: If9fdad7ee19c1ab6e1180a1ba59d2cdc2d2535f5 Reviewed-by: David Schulz <david.schulz@qt.io>