Merge remote-tracking branch 'origin/release' into stableold/5.2

Change-Id: I6d8fce7daab4dcfc9ffc93543dd0a1337a3f3c9d

2 files changed, 45 insertions, 5 deletions

diff --git a/dist/changes-5.2.1 b/dist/changes-5.2.1
new file mode 100644
index 000000000..430099f16
--- /dev/null
+++ b/dist/changes-5.2.1
@@ -0,0 +1,42 @@
+Qt 5.2.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.2.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.2
+
+The Qt version 5.2 series is binary compatible with the 5.1.x series.
+Applications compiled for 5.1 will continue to run with 5.2.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+androiddeployqt
+---------------
+
+ - [QTBUG-35401] Debug deployment is now much faster
+ - [QTBUG-35129] androiddeployqt now updates deployed plugins and
+   imports when the APK is updated on the device.
+
+Qt Assistant
+------------
+
+ - mailto links now work again in Qt Assistant.
+
+Qt Linguist
+-----------
+
+ - [QTBUG-35094] TS files are now always written with normalized numerus forms
+
+ - lupdate:
+   * Tr and TR won't be misinterpreted as tr any more
diff --git a/src/assistant/help/qhelp_global.cpp b/src/assistant/help/qhelp_global.cpp
index ff972633f..795906c16 100644
--- a/src/assistant/help/qhelp_global.cpp
+++ b/src/assistant/help/qhelp_global.cpp
@@ -48,15 +48,13 @@
 
 QString QHelpGlobal::uniquifyConnectionName(const QString &name, void *pointer)
 {
-    static int counter = 0;
     static QMutex mutex;
-
     QMutexLocker locker(&mutex);
-    if (++counter > 1000)
-        counter = 0;
+
+    static QHash<QString,quint16> idHash;
 
     return QString::fromLatin1("%1-%2-%3").
-        arg(name).arg(quintptr(pointer)).arg(counter);
+        arg(name).arg(quintptr(pointer)).arg(++idHash[name]);
 }
 
 QString QHelpGlobal::documentTitle(const QString &content)