feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
88,653 Commits 108 Branches 368 Tags
d1a4917d295953460e395f6bd470cb15afe7a28e
Commit Graph

9 Commits

Author SHA1 Message Date
Mahmoud Badri
f462be8e80 QmlDesigner: Prevent adding component materials to the content lib 
Also remove the experimental restriction on the content lib user section

Fixes: QDS-12637
Change-Id: Ice2ac3f32a934d7c65ea7f406a2b5f8c4b5fed0c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2024-05-14 14:02:28 +00:00
Mahmoud Badri
5a13304d72 QmlDesigner: Save a project material to content library 
Fixes: QDS-12392
Change-Id: Ic84197bb1bcede6d3b06d1cff09f00617cc2a958
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2024-04-09 12:31:44 +00:00
Tim Jenßen
feabda3aa7 Merge remote-tracking branch 'origin/10.0' into qds/dev 
bigger conflicts resolved at:
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
 2023-03-26 16:26:18 +02:00
Thomas Hartmann
f47d5c77d2 QmlDesigner: Use StudioQuickWidget in material browser 
The event filter has to be installed on the actual QQuickWidget.
Using registerPropertyMap instead of global context properties.

Task-number: QDS-9124
Change-Id: Ic4d26081bb10b4cb4c8cca7050180feb1c081664
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2023-03-09 09:49:18 +00:00
Miikka Heikkinen
d39f469e51 QmlDesigner: Fix focus issues in material browser 
Fixed focus loss on context menu close.
Fixed an issue with main view also handling cursor and enter keys when
editing material name.
Expanding a section now focuses the expanded section.
Dragging items from content library now focuses correct section.

Fixes: QDS-9215
Change-Id: I2176c7e52d8855c547db426b55ab739ca8f1db06
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2023-02-23 12:38:29 +00:00
Kai Köhne
4e9c1d126c Replace GPL-3.0 with GPL-3.0-only 
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>
 2023-01-10 08:05:04 +00:00
Mahmoud Badri
d5a7f25e60 QmlDesigner: Implement content library view 
Fixes: QDS-8058
Fixes: QDS-8059
Change-Id: I1adfdc7ac15141e010467813ec6e673060269241
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2022-11-08 10:04:43 +00:00
Miikka Heikkinen
8da35bac0f QmlDesigner: Add support for SpecularGlossyMaterial 
Task-number: QDS-8087
Change-Id: Ic5cdca5d61d5f4ad11f63f3f5a59907798cde763
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2022-10-25 15:06:35 +00:00
Mahmoud Badri
e55ea179c4 QmlDesigner: Extract material browser ctx menus into separate components 
Change-Id: I43305567f5224ed8015bcb507c7ee27e268d4d67
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2022-10-18 14:54:32 +00:00