feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.13' into 4.14

Browse Source 
Conflicts:
    src/shared/qbs

Change-Id: If75741825f5788165f9bf2f0248e976811273b6a
This commit is contained in:
Eike Ziller
2020-11-12 11:39:01 +01:00
parent 1e8ed5092d 524cad144a
commit 46d2046173
4 changed files with 110 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmldesigner/components/annotationeditor/annotationcommenttab.cpp
View File

@@ -43,16 +43,16 @@ AnnotationCommentTab::AnnotationCommentTab(QWidget *parent)
ui->titleEdit->setModel(new QStringListModel{QStringList{"Description",
"Display Condition",
"helper_lines"
"highlight"
"helper lines",
"highlight",
"project author",
"project confirmed",
"project developer",
"project distributor",
"project modified",
"project type"
"project type",
"project version",
"Screen Description"
"Screen Description",
"Section"}});
connect(ui->titleEdit, &QComboBox::currentTextChanged,