diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-20 10:39:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-20 10:39:32 +0200 |
| commit | 0e3d54f8d7f9be26687afebcc9f456e4cefc2357 (patch) | |
| tree | f3826c927305cc137006aed968be6fbf57b42009 /tests/auto/render/loadscenejob/loadscenejob.pro | |
| parent | 52121396c55e6100316f006c87b4fdaa8b5a0719 (diff) | |
| parent | 7e638edbd15640302516f9a69d20f62d26d4af06 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/render/framegraph/qrendersurfaceselector.cpp
src/render/frontend/qrendersettings.cpp
src/render/jobs/renderviewjobutils_p.h
tests/auto/render/render.pro
Change-Id: Ibe9eb962e3990e07f01a5608a2d60c79bc4c160f
Diffstat (limited to 'tests/auto/render/loadscenejob/loadscenejob.pro')
| -rw-r--r-- | tests/auto/render/loadscenejob/loadscenejob.pro | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/render/loadscenejob/loadscenejob.pro b/tests/auto/render/loadscenejob/loadscenejob.pro new file mode 100644 index 000000000..3901c3545 --- /dev/null +++ b/tests/auto/render/loadscenejob/loadscenejob.pro @@ -0,0 +1,12 @@ +TEMPLATE = app + +TARGET = tst_loadscenejob + +QT += 3dcore 3dcore-private 3drender 3drender-private testlib + +CONFIG += testcase + +SOURCES += tst_loadscenejob.cpp + +include(../../core/common/common.pri) +include(../commons/commons.pri) |