diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 21:48:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-26 21:50:16 +0100 |
| commit | a359bd756a98a0462bbd039d9b76981d73dc11f7 (patch) | |
| tree | 4917b25a005e75344a8f9ba60713ef5b4baa3533 /tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp | |
| parent | 3d30f6151c0c2884b1f15280301e552b5f67949c (diff) | |
| parent | 5a68874f7a2f18070890bec7c3259af94abe320b (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/doc/src/qt3dcollision-module.qdoc
src/render/frontend/qcamera.cpp
src/render/frontend/qcameralens.cpp
Change-Id: I8a0ae250a6b8e065a1ef3c817968ebb7ef23b20d
Diffstat (limited to 'tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp')
| -rw-r--r-- | tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp b/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp index 7916bd82c..2ed21e255 100644 --- a/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp +++ b/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp @@ -58,9 +58,15 @@ public: tst_ArrayResource() : m_value(0) {} + void cleanup() { m_value = 0; } + QAtomicInt m_value; }; +QT_BEGIN_NAMESPACE +Q_DECLARE_RESOURCE_INFO(tst_ArrayResource, Q_REQUIRES_CLEANUP) +QT_END_NAMESPACE + typedef Qt3DCore::QHandle<tst_ArrayResource> tHandle; typedef Qt3DCore::QHandle<tst_ArrayResource, 4> tHandle4; typedef Qt3DCore::QHandle<tst_ArrayResource, 8> tHandle8; |