Merge remote-tracking branch 'origin/5.6' into dev

Based on merge done by Liang Qi

Change-Id: Id566e5b9f284d29bff2199f13f9417c660f5b26f

2 files changed, 5 insertions, 4 deletions

diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index f8e26314ec..9acddcc7ea 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -2424,10 +2424,6 @@ bool QTest::compare_string_helper(const char *t1, const char *t2, const char *ac
     \internal
 */
 
-/*! \fn bool QTest::qCompare(bool const &t1, int const &t2, const char *actual, const char *expected, const char *file, int line)
-  \internal
- */
-
 /*! \fn bool QTest::qTest(const T& actual, const char *elementName, const char *actualStr, const char *expected, const char *file, int line)
     \internal
 */
diff --git a/src/testlib/qtesttable.cpp b/src/testlib/qtesttable.cpp
index d20bdd8467..05cce37a47 100644
--- a/src/testlib/qtesttable.cpp
+++ b/src/testlib/qtesttable.cpp
@@ -46,6 +46,11 @@ QT_BEGIN_NAMESPACE
 class QTestTablePrivate
 {
 public:
+    ~QTestTablePrivate()
+    {
+        qDeleteAll(dataList.begin(), dataList.end());
+    }
+
     struct Element {
         Element() : name(Q_NULLPTR), type(0) {}
         Element(const char *n, int t) : name(n), type(t) {}