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

Merge remote-tracking branch 'origin/4.9'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/tools/clangpchmanagerbackend/source/taskscheduler.h

Change-Id: I518adaf647df412887c2a372416634359f09ad2a
This commit is contained in:
Eike Ziller
2019-03-05 10:22:45 +01:00
parent 44886ad65a 26f6cbf8b5
commit 0619de8681
60 changed files with 702 additions and 684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cpptools/clangdiagnosticconfigsmodel.cpp
View File

@@ -167,7 +167,7 @@ static void addConfigForBuildSystem(ClangDiagnosticConfigsModel &model)
ClangDiagnosticConfig config;
config.setId("Builtin.BuildSystem");
config.setDisplayName(QCoreApplication::translate("ClangDiagnosticConfigsModel",
"Build-systems' warnings"));
"Build-system warnings"));
config.setIsReadOnly(true);
config.setUseBuildSystemWarnings(true);

9
src/plugins/cpptools/clangdiagnosticconfigswidget.ui
View File

@@ -105,14 +105,7 @@
</layout>
</item>
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="minimumSize">
<size>
<width>700</width>
<height>500</height>
</size>
</property>
</widget>
<widget class="QTabWidget" name="tabWidget"/>
</item>
</layout>
</item>

2
src/plugins/cpptools/clazychecks.ui
View File

@@ -23,7 +23,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>See &lt;a href=&quot;https://github.com/KDE/clazy&quot;&gt;clazy's homepage&lt;/a&gt; for more information.</string>
<string>See &lt;a href=&quot;https://github.com/KDE/clazy&quot;&gt;Clazy's homepage&lt;/a&gt; for more information.</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>