Merge branch '2.4' into 2.5

diff --cc share/qtcreator/qml/qmljsdebugger/jsdebuggeragent.cpp
Simple merge

diff --cc share/qtcreator/translations/qtcreator_uk.ts
index 837bc8e,58cf0a9..2de4330
--- 1/share/qtcreator/translations/qtcreator_uk.ts
--- 2/share/qtcreator/translations/qtcreator_uk.ts
+++ b/share/qtcreator/translations/qtcreator_uk.ts
@@@ -1738,10 -1726,10 +1726,10 @@@ Specifies how backspace interacts with 
      </message>
  </context>
  <context>
 -    <name>CVS::Internal::CVSPlugin</name>
 +    <name>Cvs::Internal::CvsPlugin</name>
      <message>
          <source>Cannot find repository for &apos;%1&apos;</source>
-         <translation type="unfinished"></translation>
+         <translation>Неможливо знайти сховище для &apos;%1&apos;</translation>
      </message>
      <message>
          <source>Parsing of the log output failed</source>
@@@ -2015,10 -2003,10 +2003,10 @@@
      </message>
  </context>
  <context>
 -    <name>CVS::Internal::CheckoutWizardPage</name>
 +    <name>Cvs::Internal::CheckoutWizardPage</name>
      <message>
          <source>Location</source>
-         <translation type="unfinished">Розташування</translation>
+         <translation>Розташування</translation>
      </message>
      <message>
          <source>Specify repository and path.</source>
@@@ -2041,10 -2029,10 +2029,10 @@@
      </message>
  </context>
  <context>
 -    <name>CVS::Internal::SettingsPage</name>
 +    <name>Cvs::Internal::SettingsPage</name>
      <message>
          <source>Configuration</source>
-         <translation type="unfinished"></translation>
+         <translation>Конфігурація</translation>
      </message>
      <message>
          <source>CVS command:</source>
@@@ -27969,10 -27933,10 +27933,10 @@@ Influences the indentation of continuat
      </message>
  </context>
  <context>
 -    <name>VCSBase::VcsConfigurationPage</name>
 +    <name>VcsBase::VcsConfigurationPage</name>
      <message>
          <source>Configuration</source>
-         <translation type="unfinished"></translation>
+         <translation type="unfinished">Конфігурація</translation>
      </message>
      <message>
          <source>Please configure &lt;b&gt;%1&lt;/b&gt; now.</source>

diff --cc share/qtcreator/translations/qtcreator_zh_CN.ts
Simple merge