aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmldesigner/components/annotationeditor
Commit message (Expand)AuthorAgeFilesLines
* QmlDesigner: Remove AnnotationToolMahmoud Badri2020-10-203-354/+0
* Merge remote-tracking branch 'origin/4.13' into 4.14Eike Ziller2020-10-192-7/+27
|\
| * Automatic generation of Description & Display Condition tabLukasz Ornatek2020-10-162-7/+27
* | Merge remote-tracking branch 'origin/4.13' into masterEike Ziller2020-08-311-4/+5
|\|
| * QmlDesigner: Annotations for StatesAleksei German2020-08-271-4/+5
* | Annotation Editor: Fix UI text capitalizationLeena Miettinen2020-08-111-1/+1
|/
* Merge remote-tracking branch 'origin/qds-1.59'Eike Ziller2020-06-0810-97/+584
|\
| * QmlDesigner Global Annotation StatusAleksei German2020-05-0610-97/+584
* | Merge remote-tracking branch 'origin/qds-1.59'Tim Jenssen2020-04-289-16/+284
|\|
| * QmlDesigner: Global Annotations EditorAleksei German2020-04-225-4/+272
| * Merge remote-tracking branch 'origin/4.12' into qds-1.59Tim Jenssen2020-04-221-1/+1
| |\
| * | QmlDesigner: Rich Text Editor integrationAleksei German2020-04-094-12/+12
* | | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-04-211-1/+1
|\ \ \ | | |/ | |/|
| * | QmlDesigner: Reduce priority for editing anotationsThomas Hartmann2020-04-201-1/+1
| |/
* | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-02-263-25/+26
|\|
| * Globally disable WindowContextHelpButtonHintKai Koehne2020-02-251-1/+0
| * QmlDesigner: minor fixes for AnnotationsAleksei German2020-02-193-24/+26
* | QmlDesigner: Fix annotationeditorTobias Hunger2020-02-241-2/+4
|/
* QmlDesigner: Fix build with testsChristian Stenger2020-02-183-431/+0
* QmlDesigner: Fix qbs buildChristian Kandeler2020-02-171-3/+2
* QmlDesigner: QDS AnnotationsAleksei German2020-02-1713-0/+1763