diff options
| author | Ari Koivisto <ari.koivisto@gmail.com> | 2012-10-03 19:29:33 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-14 22:58:42 +0200 |
| commit | 3c3f8dd7c6f2a681ed11e941568ecc569377c389 (patch) | |
| tree | df7462a8f313355424c76b19221652dd187fd442 /tests | |
| parent | df4020d9d2580a1a4790a43af689d2b5132cf1e8 (diff) | |
| download | qtxmlpatterns-3c3f8dd7c6f2a681ed11e941568ecc569377c389.tar.gz | |
Fix XmlListModel memory leak
This is a forward port of a memory leak fix committed to
Qt 4.8 (QTBUG-15191). The fix includes all changes except
changes to qitem_p.h which has changed in Qt 5.0. Additionally
fix qxmlquery autotest failure introduced in the original
Qt 4.8 patch.
Task-number: QTBUG-27357
Change-Id: Ia0e916d9d6bccea014d28920cef48d6e47e8f04f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'tests')
4 files changed, 9 insertions, 1 deletions
diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index 928d67b..23af7a2 100644 --- a/tests/auto/qxmlquery/tst_qxmlquery.cpp +++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp @@ -3305,7 +3305,7 @@ void tst_QXmlQuery::bindVariableQXmlQueryInvalidate() const QXmlQuery query2; query2.setQuery("'query2'"); - query.bindVariable(QLatin1String("name"), query); + query.bindVariable(QLatin1String("name"), query2); QVERIFY(!query.isValid()); } diff --git a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro index b534495..f8904cc 100644 --- a/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro +++ b/tests/auto/xmlpatternsdiagnosticsts/xmlpatternsdiagnosticsts.pro @@ -24,4 +24,7 @@ wince* { catalog.path = . DEPLOYMENT += catalog } + DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 +requires(contains(QT_CONFIG,private_tests)) + diff --git a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro index c9fe689..a1e7896 100644 --- a/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro +++ b/tests/auto/xmlpatternsschemats/xmlpatternsschemats.pro @@ -21,4 +21,7 @@ QT += xml testlib INCLUDEPATH += \ ../xmlpatternsxqts \ ../xmlpatternssdk + DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 +requires(contains(QT_CONFIG,private_tests)) + diff --git a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro index f6d492e..41e9c68 100644 --- a/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro +++ b/tests/auto/xmlpatternsxqts/xmlpatternsxqts.pro @@ -17,3 +17,5 @@ INCLUDEPATH += $$(QTDIR)/include/QtXmlPatterns/private \ QT += xml testlib TARGET = tst_xmlpatternsxqts DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 +requires(contains(QT_CONFIG,private_tests)) + |