Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Utilities
KDebugSettings
Commits
86acb9f8
Commit
86acb9f8
authored
Jan 07, 2022
by
Laurent Montel
😁
Browse files
Add support for debug categories in qt6
parent
dbf2f470
Pipeline
#119989
passed with stage
in 1 minute and 43 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/kdebugsettingsloadingcategories.cpp
View file @
86acb9f8
...
...
@@ -36,15 +36,24 @@ void KDebugSettingsLoadingCategories::readQtLoggingFile()
void
KDebugSettingsLoadingCategories
::
readCategoriesFiles
(
const
QString
&
path
)
{
// KDE debug categories area
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
const
QString
confAreasFile
=
QStandardPaths
::
locate
(
QStandardPaths
::
GenericDataLocation
,
QStringLiteral
(
"qlogging-categories6/kde.categories"
));
#else
const
QString
confAreasFile
=
QStandardPaths
::
locate
(
QStandardPaths
::
GenericDataLocation
,
QStringLiteral
(
"qlogging-categories5/kde.categories"
));
#endif
if
(
!
confAreasFile
.
isEmpty
())
{
KDebugSettingsUtil
::
readLoggingCategories
(
confAreasFile
,
mCategoriesList
,
false
);
}
mRenameCategoriesList
.
clear
();
// Load *.renamecategories file in QStandardPaths::ConfigLocation for kde apps.
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
const
QStringList
dirs
=
QStandardPaths
::
locateAll
(
QStandardPaths
::
ConfigLocation
,
QString
(),
QStandardPaths
::
LocateDirectory
)
+
QStandardPaths
::
locateAll
(
QStandardPaths
::
GenericDataLocation
,
QStringLiteral
(
"qlogging-categories6/"
),
QStandardPaths
::
LocateDirectory
);
#else
const
QStringList
dirs
=
QStandardPaths
::
locateAll
(
QStandardPaths
::
ConfigLocation
,
QString
(),
QStandardPaths
::
LocateDirectory
)
+
QStandardPaths
::
locateAll
(
QStandardPaths
::
GenericDataLocation
,
QStringLiteral
(
"qlogging-categories5/"
),
QStandardPaths
::
LocateDirectory
);
#endif
for
(
const
QString
&
dir
:
dirs
)
{
const
QStringList
fileNames
=
QDir
(
dir
).
entryList
(
QStringList
()
<<
QStringLiteral
(
"*.renamecategories"
));
for
(
const
QString
&
file
:
fileNames
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment