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

Merge remote-tracking branch 'origin/13.0'

Browse Source 
Conflicts:
	coin/instructions/build.yaml

Change-Id: Ie5530baed71a79d49cb107d3f82e4427475c6ff7
This commit is contained in:
Eike Ziller
2024-05-27 10:13:23 +02:00
parent 045899272c 7a4bbab6f7
commit 928f6d6ac4
11 changed files with 57 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/icore.cpp
View File

@@ -570,8 +570,6 @@ bool ICore::showWarningWithOptions(const QString &title, const QString &text,
If \a scope is \c QSettings::SystemScope, only the installation settings
shipped with the current version of \QC will be read. This
functionality exists for internal purposes only.
\sa settingsDatabase()
*/
QtcSettings *ICore::settings(QSettings::Scope scope)
{