Merge remote-tracking branch 'origin/4.15'

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp

Change-Id: I403b236c40d73a61ae22304e289e9d4374366395

src/plugins/vcsbase/submiteditorwidget.cpp

@@ -546,10 +546,10 @@ void SubmitEditorWidget::verifyDescription()
                        "<ul>"
                        "<li>Avoid very short commit messages.</li>"
                        "<li>Consider the first line as subject (like in email) "
-                       "and keep it shorter than %1 characters.</li>"
+                       "and keep it shorter than %n characters.</li>"
                        "<li>After an empty second line, a longer description can be added.</li>"
                        "<li>Describe why the change was done, not how it was done.</li>"
-                       "</ul>").arg(MaxSubjectLength));
+                       "</ul>", nullptr, MaxSubjectLength));
         }
 }
 

src/plugins/vcsbase/submiteditorwidget.ui

@@ -37,6 +37,9 @@
    </property>
    <item>
     <widget class="QScrollArea" name="scrollArea">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
      <property name="widgetResizable">
       <bool>true</bool>
      </property>