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

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Conflicts:
	src/plugins/todo/optionsdialog.cpp
	src/plugins/todo/todoprojectsettingswidget.cpp

Change-Id: I24ca90c2fc2cd707df901d42694df6d0e27d696d
This commit is contained in:
Eike Ziller
2022-07-20 11:53:36 +02:00
parent 034acdeeb2 e1b0ba2473
commit 3ec87e37ee
77 changed files with 917 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/todo/optionsdialog.cpp
View File

@@ -26,8 +26,9 @@
#include "optionsdialog.h"
#include "keyworddialog.h"
#include "constants.h"
#include "keyword.h"
#include "keyworddialog.h"
#include "settings.h"
#include "todotr.h"
@@ -267,7 +268,7 @@ void OptionsDialog::apply()
TodoOptionsPage::TodoOptionsPage(Settings *settings, const std::function<void ()> &onApply)
{
setId("TodoSettings");
setId(Constants::TODO_SETTINGS);
setDisplayName(Tr::tr("To-Do"));
setCategory("To-Do");
setDisplayCategory(Tr::tr("To-Do"));