Merge remote-tracking branch 'gerrit/12.0'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: Ide00b6dd5b44d637b18892c663035e736de03485

src/plugins/cppeditor/cppfilesettingspage.cpp

@@ -302,7 +302,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(CppFileSettings *settings)
 
     Column {
         Group {
-            title("Headers"),
+            title(Tr::tr("Headers")),
             Form {
                 Tr::tr("&Suffix:"), m_headerSuffixComboBox, st, br,
                 Tr::tr("S&earch paths:"), m_headerSearchPathsEdit, br,
@@ -311,7 +311,7 @@ CppFileSettingsWidget::CppFileSettingsWidget(CppFileSettings *settings)
             }
         },
         Group {
-            title("Sources"),
+            title(Tr::tr("Sources")),
             Form {
                 Tr::tr("S&uffix:"), m_sourceSuffixComboBox, st, br,
                 Tr::tr("Se&arch paths:"), m_sourceSearchPathsEdit, br,