summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes/Project
Commit message (Collapse)AuthorAgeFilesLines
* Rename "qml streams" folder to "qml"Tomi Korpipaa2019-03-201-3/+3
| | | | | | | | Task-number: QT3DS-3182 Change-Id: Ifb1b7f18b6652d26f38eeab2351c329e7cbeb425 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Increase size of EditPresentationIdDlgMiikka Heikkinen2019-03-191-2/+2
| | | | | | | | | In some cases the title gets cut off or controls are slightly squished vertically. Increasing the dialog size a bit should fix these issues. Task-number: QT3DS-3170 Change-Id: I9329ff92fdbddad7842db2e30e5026513374a864 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix qml asset import on non-windowsTomi Korpipaa2019-03-181-0/+4
| | | | | | | Task-number: QT3DS-3007 Change-Id: I0205c06e4015383a1778ffc9eae440b9d9b46964 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Fix crash/freeze when changing projectTomi Korpipaa2019-01-231-0/+18
| | | | | | | | | | | | If the new project is in a totally different directory tree, we may end up with crashes when trying to parse something that should not be parsed. Recreating the FileSystemModel removes unwanted items from the model. Task-number: QT3DS-2936 Change-Id: I280afe8afb4f9faa7b68f613de06520ad493ccff Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement 'save project as' and 'duplicate presentation'Miikka Heikkinen2019-01-107-11/+75
| | | | | | | | | | | | | | 'Save project as' creates a copy of the existing project and allows optionally opening the copy in the editor. 'Duplicate presentation' copies the active or targeted presentation into the same folder as the original presentation. User must supply the new name, but the id is autogenerated. Task-number: QT3DS-2630 Change-Id: I13e1cffd0b9d2705fbab7ca72b9dd1f5d0691e77 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Use original presentation id when importing a presentationMiikka Heikkinen2018-12-191-10/+28
| | | | | | | | | | | | | If an original presentation id can be resolved for an imported presentation, that will be used as the id instead of generating a new one. In case the id is a duplicate with an existing id, then a new one will be generated based on the file name. Task-number: QT3DS-2486 Change-Id: I1bf75fedfa9230a4f73271522800eaab02942ab4 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Skip import of asset where source and target asset is the same fileMiikka Heikkinen2018-12-071-0/+2
| | | | | | | | Task-number: QT3DS-2832 Change-Id: I3f82a94a68684d53cc840b71f96f6f2bdff6ddc7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Import data inputs when importing a presentationMiikka Heikkinen2018-12-032-8/+45
| | | | | | | | | | | Data inputs used by imported presentations are copied from source project. Duplicate inputs are ignored. Task-number: QT3DS-2742 Change-Id: Ia0162f3f91c78b35888e235b764985e09160498d Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix referenced assets importing when importing a presentationMiikka Heikkinen2018-11-291-10/+15
| | | | | | | | | | | | | | Fixes following issues when importing presentations: - Importing presentations with different relative path to project file caused some assets to be imported into wrong folders - Importing custom materials didn't import texture assets that didn't have a default asset set in .material file Task-number: QT3DS-2599 Change-Id: I38e2afa1fbf793f9808a0056529336f26e6cad7e Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix bugs concerning freshly created matdefsJere Tuliniemi2018-11-221-9/+22
| | | | | | | | | | | | | | Material creation inside the material container has to be a transaction so that the created material functions correctly. This creates an undoable command which for now is just removed from the undo stack after the material creation. Some undo behaviors for the matdefs are also fixed. Task-number: QT3DS-2685 Task-number: QT3DS-2686 Change-Id: I5abe9884745b7092ff454e2463b74898ab87822a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow matdef creation to all materials subfoldersJere Tuliniemi2018-11-201-2/+2
| | | | | | | Task-number: QT3DS-2108 Change-Id: Ied3f5256506cbf359aeafbb295f0aabe87fee940 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix importing .materialdef filesMiikka Heikkinen2018-11-161-55/+73
| | | | | | | | | | | | | | | | | | | The paths were changed to always be relative to project file in materialdef files. The default texture paths of materials and effects are converted to presentation relative when an instance is made out of them to keep paths consistent in presentations. Importing materialdef file now imports all referenced assets, including default assets of the shader. In-use highlighting in project panel got fixed alongside import fixes as they use same mechanism to determine referred assets. Task-number: QT3DS-2656 Task-number: QT3DS-2657 Change-Id: I473e77ab5d76328c642dc16fc3a3b4016bf85313 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow same-named matdefs in different foldersJere Tuliniemi2018-11-131-3/+2
| | | | | | | | | Material path is now __Container.materials/Material if a Material.matdef is located under materials folder. Task-number: QT3DS-2108 Change-Id: I860e2946ce012692b8d1896f06290b7bb64083fe Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Import non-default custom material assetsMiikka Heikkinen2018-11-131-1/+5
| | | | | | | | Task-number: QT3DS-2599 Change-Id: Ia2525ab016cad51892515182b1e9e43834dfc204 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix missing asset imports when importing a presentationMiikka Heikkinen2018-11-073-55/+118
| | | | | | | | | | | | | | | | | | The following file types will now be imported if the imported presentation refers to them: Files (.import/.mesh) required by a group's import property. Material definition (.materialdef) files. Assets of a qml streams. This also fixes project reference highlights related to above files, and a few minor related issues. Change-Id: I967a2d45013ac12def1db7e067cb8239f81c079a Fixes: QT3DS-2626 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Highlight references by other presentations in projectMiikka Heikkinen2018-11-074-14/+152
| | | | | | | | | | | Project panel now highlights assets that are referenced by another presentation in the project. Task-number: QT3DS-2594 Change-Id: Ibad2d5df92b942ea281ec7e0cbf946b9e3941d81 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Add delete option to project view context menuMiikka Heikkinen2018-11-054-30/+64
| | | | | | | | | | | | Any asset can be deleted. Deleting a presentation or qml-stream will update the project file accordingly. Referenced assets cannot be deleted. Task-number: QT3DS-231 Change-Id: Iaf21c4b27b45f1ef322385b3df5adb1772d55e23 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add an inspector toolbar for materialsJere Tuliniemi2018-10-312-2/+2
| | | | | | | Task-number: QT3DS-2108 Change-Id: Iccc557d158524b9bf32646716aaefc826da1f675 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Change project view material context menuJere Tuliniemi2018-10-311-1/+1
| | | | | | | Task-number: QT3DS-2108 Change-Id: Idbb815d752246892a41d855da741b1998f390be2 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Change .matdata extension to .materialdefJere Tuliniemi2018-10-302-4/+4
| | | | | | | Task-number: QT3DS-2108 Change-Id: Iefc7a0054a1c506b19a3c1cafa45093cd6b0fd70 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix DnD images to the timelineMahmoud Badri2018-10-262-0/+7
| | | | | | | | | | | | | - Correct dragged image path setting. - Correct title of the choose image dialog upon dropping on a material row. - Correct the property that is set, upon dropping on a material row. - Allow dropping images on a ref material Task-number: QT3DS-2267 Task-number: QT3DS-2548 Change-Id: Ie05364c1b8f24fdb7ba85142a1eb5b2f89f16667 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix dialog resizing issues when moving between different screensMiikka Heikkinen2018-10-194-48/+102
| | | | | | | | | | | | | | | | Moving dialogs between screens with different pixel ratios caused some dialogs to resize incorrectly. Fixed the sizes of dialogs and adjusted their layout so it keeps consistent. Also fixed some accept/reject handling, as it could be bypassed by triggering accept/reject by some other means besides the dialog buttons. Now the relevant handling is always called regardless of the way a dialog is closed. Task-number: QT3DS-2514 Change-Id: Ic53b395866db3ef9720cdd5474d7937869681519 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Clean up StudioUtilsMiikka Heikkinen2018-10-182-5/+5
| | | | | | | | | | | Made StudioUtils a class of static functions instead of global functions. Also cleaned up the code a bit where changes happened because of this change. Change-Id: Ic583dd25bf228c7e344be6664b6651958d84906e Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remember override/skip all choice correctly within single multi-importMiikka Heikkinen2018-10-162-103/+75
| | | | | | | Task-number: QT3DS-2474 Change-Id: I9e81aa1e61978c909ce8ddc899e992f1c3f7daca Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove native separators usageMiikka Heikkinen2018-10-161-3/+3
| | | | | | | | | | | For some reason Qt3DSFile stored paths internally in native format. There is no reason for that, so made sure the paths are stored in Qt format instead. Task-number: QT3DS-2489 Change-Id: Id39203136c3e39a6dd0d4c0ead7fc4f99cbf1c2d Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Drag and drop images to the timelineMahmoud Badri2018-10-153-16/+3
| | | | | | | | | | - You can now drag images from the project palette to the timeline rows. Supported drop rows are layers, materials and images. - Relevant tweaks. Task-number: QT3DS-2267 Change-Id: I0646b47d31e38c89fe95461c7f2fb040a479b43e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Change material context menusJere Tuliniemi2018-10-153-4/+12
| | | | | | | | | | | | Instead of "Add Material", the context menu now has a "Create" row that contains a "Shared Material" button that creates the new material. Additionally, the "Create" row is also shown when right-clicking the files inside the materials folder. Task-number: QT3DS-2481 Change-Id: I4d04eff7242376265b404bb8f5f0544b3be21721 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Ensure each asset is only imported once per import operationMiikka Heikkinen2018-10-122-39/+109
| | | | | | | | | | | | If some assets included in the import were also dependent assets of other imported assets, it is now enforced that each of duplicated assets is only imported once. Task-number: QT3DS-2475 Change-Id: Ic3cc7b054df75582de30ed079990fdaeb19a75cb Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Make effect/material asset importing more robustMiikka Heikkinen2018-10-121-23/+48
| | | | | | | | | | | | Refactored how effect and material assets are imported to remove code duplication and support also importing from another project rather than just from content library. Task-number: QT3DS-2476 Change-Id: I738e80d5df6a76a8ccc8834c2ce8308eac8f8512 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash when importing multiple presentations at onceMiikka Heikkinen2018-10-122-12/+23
| | | | | | | | | | | | | | | Project file update and subpresentation registration is now done only once when importing multiple presentations/qml-streams. Besides making the import process significantly faster, this approach prevents a crash when subpresentations are registered multiple times within the scope of a single event. Change-Id: I56dc0d6d04e83ca54a72bf844569df1d6d50f1ad Fixes: QT3DS-2472 Fixes: QT3DS-2448 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Change many CStrings to QStringMahmoud Badri2018-10-103-15/+11
| | | | | | | | | | | | | | - A lot of CString, CFilePath, and Qt3DSFile occureneces and their relevant code has been removed to save the costy back and forth conversion between CString and QString. - Renovated several classes as part of the process (Preferences classes, recent items, build configuration, probably few more) - Assorted tweaks here and there Task-number: QT3DS-1899 Task-number: QT3DS-2455 Change-Id: Ibbf4c3b7ab0b9fe6e19d8aed822fa29d43b99086 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Refactor mouse handling in project paletteMiikka Heikkinen2018-10-103-108/+112
| | | | | | | | | | | | | | | | | Due to regression QTBUG-70999, mouse responsiveness on project palette was severely hampered. Refactored the mouse handling code to get rid of a need for the hacky doubleclick timer to improve things a bit, but it's still missing the first click after a double click. We can't fix that in our code. Also fixed an issue about opening the edit dialog for presentation id and prevented trying to drag presentations that do not have id. Change-Id: I2269a7adfeb9917ed5fa2be11e0356ef58b0d8f6 Fixes: QT3DS-2450 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix right click accepted as part of the double clickMiikka Heikkinen2018-10-051-14/+16
| | | | | | | Task-number: QT3DS-2416 Change-Id: I9b0c05edf1c11b1af44ae0790d22d0927f0d0067 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Implement renaming presentationsMiikka Heikkinen2018-10-058-22/+179
| | | | | | | | | | | Presentation files can now be renamed via project palette context menu. Renaming updates .uia file and supresentations array accordingly. Change-Id: I4a7a1c49cc20c8b26ecaaeceae5a5d804366ad8c Task-number: QT3DS-2231 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Merge branch '2.1' into masterMiikka Heikkinen2018-10-032-51/+30
|\ | | | | | | Change-Id: Ic6f1c7909fe6aa7b573592f8c2bbf86cdd60f680
| * Fix constant CPU load when project contains qml filesMiikka Heikkinen2018-09-271-14/+1
| | | | | | | | | | | | | | | | | | | | | | | | Checking whether a file is a behavior or qml stream is expensive, and it was getting done continuously for some reason. Now we cache the result of the first check for each file. Task-number: QT3DS-2404 Change-Id: Iaf7fab48559790c6561ecf6b00d60febd68e6a08 Reviewed-by: Kimmo Leppälä <kimmo.leppala@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * Fix dragging binding loops and the subpresentation drag dialog issuesMiikka Heikkinen2018-09-272-37/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binding loops while dragging were caused by QML drag implementation that was unneeded since the drag is actually handled by C++ QDrag. Removed the superfluous QML drag things. This also seemed to fix the duplicate drag layer/texture/cancel dialog that sometimes happened. Additially, the layer/texture/cancel dialog was modified to use explicit layer and texture buttons instead of renamed standard buttons. Task-number: QT3DS-2397 Change-Id: I86c8ab61e4450b4aff3ef4bb9cae3776aa47959a Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: Kimmo Leppälä <kimmo.leppala@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Show presentation ID in project paletteMiikka Heikkinen2018-10-036-17/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If presentation is not part of the project, a warning icon is shown instead of ID. Editing the ID of such presentation adds it to the project. Also made initial expanding of presentations folder work more reliably. Task-number: QT3DS-2231 Change-Id: I2dd4fbc3b3dbb3b18feb9fab88621e23d175c856 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Add possibility to change initial presentationMiikka Heikkinen2018-10-016-24/+109
| | | | | | | | | | | | | | | | | | Initial presentation can be changed via project palette context menu. Task-number: QT3DS-2138 Change-Id: Id552ba1f23e79590d9ccfb22ab1714d050d5b5f4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | Save texture properties to material filesJere Tuliniemi2018-09-261-2/+3
| | | | | | | | | | | | | | | | | | | | | | Textures and texture properties are children of the materials, so they have to be saved with the material properties. Task-number: QT3DS-2316 Change-Id: I7407ca38bd0badbc7dab168f993938a895f14fa7 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge branch '2.1' into masterMiikka Heikkinen2018-09-256-17/+47
|\| | | | | | | Change-Id: Idfecbefcf5c1e279093f250a4a46d57f2a518d25
| * Fix crashes when dealing with malformed qml filesv2.1.0-rcMiikka Heikkinen2018-09-212-15/+24
| | | | | | | | | | | | | | | | | | | | Attempting to determine the qml file type (script or qml-stream) assumed there was always a valid root object. If the qml file had a bug that caused loading it to fail, that assumption caused a crash. Task-number: QT3DS-2381 Change-Id: I7016540fe48593dff3f01107dc6826f1f6d3929f Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| * Fix updating project palette file referencesTomi Korpipaa2018-09-191-0/+1
| | | | | | | | | | | | | | | | | | | | File references of some texture assets, like the environment maps of custom materials, did not work. Task-number: QT3DS-2351 Change-Id: I545fc5dfca3bf4cb28ab1b987d0b1d86bd55bcbc Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix clipping of project palette buttonsTomi Korpipaa2018-09-111-2/+1
| | | | | | | | | | | | | | Task-number: QT3DS-2286 Change-Id: I60373922f3da6df3ffff4a2fec3706f1db0d671f Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Add a 'Detach material' check box to the ChooseImagePropertyDlgMahmoud Badri2018-09-063-0/+21
| | | | | | | | | | | | | | | | | | | | | | When setting a sub-presentation to a ref material, a new check box option appears in the ChooseImagePropertyDlg, if checked the ref material will be changed to a Standard material so that the sub-presentation setting only affects this material instance. Task-number: QT3DS-2233 Change-Id: Iafff41f6994715289b13c30acf1226a4dfe86d08 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Support dots in material filenamesJere Tuliniemi2018-09-101-2/+2
| | | | | | | | | | | | | | | | | | Use the complete basename of the file and use escape chars for dots in object path traversing. Task-number: QT3DS-2279 Change-Id: I136cdd21212ce0aa16dbb381b14cd0910bf55b72 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Allow creating materials only into the materials folderTomi Korpipaa2018-09-033-5/+12
| | | | | | | | | | | | | | | | Task-number: QT3DS-2217 Change-Id: Ia115d3e2f7923f089d603224881d8550ef86eb7d Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Edit material in Inspector with double-click from project paletteTomi Korpipaa2018-09-031-2/+3
| | | | | | | | | | | | Task-number: QT3DS-2189 Change-Id: I8388bfd2f3da077ecd93c2ffac33a466bab459ad Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge branch 'master' into wip/refmaterialMiikka Heikkinen2018-08-304-12/+36
|\| | | | | | | Change-Id: I7a48e08645eb6817f1027ad9e0f9143cb11617c2
| * Open files with double-click on project viewMiikka Heikkinen2018-08-303-0/+27
| | | | | | | | | | | | | | | | | | | | | | Presentations are opened in current studio instance. Other files are opened with external editor specified by operating system. Task-number: QT3DS-2143 Change-Id: I64ea1a29137cd2c7813336718da7cb4377b8e3cd Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 10:44:57 +0000