diff options
| author | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2015-10-30 11:56:28 +0200 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2015-10-30 10:01:22 +0000 |
| commit | 0dbded1506abf172b7b3cf7685bdcb30c7b8012d (patch) | |
| tree | a0cdb79e6a482697cc96c3300b0502595b42d4b1 /tests | |
| parent | 9b9f34701f47824e8201453d148152fb0855f98a (diff) | |
d-pointer classes, private/public changes
Change-Id: I4ca133aebad0c088296ab293f95f0a6d76d18395
Task-number: QTBUG-39946
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests')
8 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp b/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp index 5515fa6ad..8d6c49f27 100644 --- a/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp +++ b/tests/auto/core/arrayresourcesmanager/dynamicarraypolicy/tst_dynamicarraypolicy.cpp @@ -36,7 +36,7 @@ #include <QtTest/QtTest> #include <QList> -#include <Qt3DCore/qhandle.h> +#include <Qt3DCore/private/qhandle_p.h> #include <Qt3DCore/private/qresourcemanager_p.h> class tst_DynamicArrayPolicy : public QObject diff --git a/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp b/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp index d56196d00..83e9a5215 100644 --- a/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp +++ b/tests/auto/core/arrayresourcesmanager/preallocatedarraypolicy/tst_preallocatedarraypolicy.cpp @@ -37,7 +37,7 @@ #include <QtTest/QtTest> #include <QList> #include <Qt3DCore/private/qresourcemanager_p.h> -#include <Qt3DCore/qhandle.h> +#include <Qt3DCore/private/qhandle_p.h> class tst_PreallocatedArrayPolicy : public QObject { diff --git a/tests/auto/core/handle/handle.pro b/tests/auto/core/handle/handle.pro index 8871261f0..da2e504fe 100644 --- a/tests/auto/core/handle/handle.pro +++ b/tests/auto/core/handle/handle.pro @@ -4,4 +4,4 @@ TEMPLATE = app SOURCES += tst_handle.cpp -QT += testlib 3dcore +QT += testlib 3dcore 3dcore-private diff --git a/tests/auto/core/handle/tst_handle.cpp b/tests/auto/core/handle/tst_handle.cpp index d993056a1..5eb92e53b 100644 --- a/tests/auto/core/handle/tst_handle.cpp +++ b/tests/auto/core/handle/tst_handle.cpp @@ -39,7 +39,7 @@ // Not really clean but as the QHandle(idx, counter) is private // This allows to use this constructor in the tests #define private public -#include <Qt3DCore/qhandle.h> +#include <Qt3DCore/private/qhandle_p.h> class tst_Handle : public QObject { diff --git a/tests/auto/core/handlemanager/handlemanager.pro b/tests/auto/core/handlemanager/handlemanager.pro index e95f1d433..ad18d5b9b 100644 --- a/tests/auto/core/handlemanager/handlemanager.pro +++ b/tests/auto/core/handlemanager/handlemanager.pro @@ -4,4 +4,4 @@ TEMPLATE = app SOURCES += tst_handlemanager.cpp -QT += testlib 3dcore +QT += testlib 3dcore 3dcore-private diff --git a/tests/auto/core/handlemanager/tst_handlemanager.cpp b/tests/auto/core/handlemanager/tst_handlemanager.cpp index 66911f2c9..13afabfe8 100644 --- a/tests/auto/core/handlemanager/tst_handlemanager.cpp +++ b/tests/auto/core/handlemanager/tst_handlemanager.cpp @@ -35,8 +35,8 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <Qt3DCore/qhandlemanager.h> -#include <Qt3DCore/qhandle.h> +#include <Qt3DCore/private/qhandlemanager_p.h> +#include <Qt3DCore/private/qhandle_p.h> class tst_HandleManager : public QObject { diff --git a/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp b/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp index a3dbb3ea1..5cbbe97bd 100644 --- a/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp +++ b/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp @@ -36,7 +36,7 @@ #include <QtTest/QtTest> #include <QList> -#include <Qt3DCore/qhandle.h> +#include <Qt3DCore/private/qhandle_p.h> #include <Qt3DCore/private/qresourcemanager_p.h> class tst_ListResourcesManager : public QObject diff --git a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp index 221c43e74..281442be7 100644 --- a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp +++ b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp @@ -36,7 +36,7 @@ #include <QtTest/QtTest> #include <QMatrix4x4> -#include <Qt3DCore/qhandle.h> +#include <Qt3DCore/private/qhandle_p.h> #include <Qt3DCore/private/qresourcemanager_p.h> #include <ctime> #include <cstdlib> |