diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-10-20 13:18:59 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-10-22 10:08:51 +0000 |
| commit | 31f9c57bc50ae053cfaf039a1dfdb128e2494458 (patch) | |
| tree | 316138cb73c49877f5a80a8496c2f1b737122fb5 /tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnInternalDefs.h | |
| parent | 4162ddeb02ee41fd4217d7f3d93d45cab3313ba8 (diff) | |
Fix issues with COIN builds
-Fix miscellaneous compile errors
-Move manual tests to manual folder and enable export of autotests
-Added widgets requirement
-Fixed autotests
-Fixed renderer and controller synchronization in QML case
-Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL
Change-Id: If6619733725d079e339bef16262e5ea1450ab20f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
Diffstat (limited to 'tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnInternalDefs.h')
| -rw-r--r-- | tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnInternalDefs.h | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnInternalDefs.h b/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnInternalDefs.h deleted file mode 100644 index c14bb055..00000000 --- a/tests/kinectsurface/QtKinectWrapper/OpenNI/Include/XnInternalDefs.h +++ /dev/null @@ -1,27 +0,0 @@ -/**************************************************************************** -* * -* OpenNI 1.x Alpha * -* Copyright (C) 2011 PrimeSense Ltd. * -* * -* This file is part of OpenNI. * -* * -* OpenNI is free software: you can redistribute it and/or modify * -* it under the terms of the GNU Lesser General Public License as published * -* by the Free Software Foundation, either version 3 of the License, or * -* (at your option) any later version. * -* * -* OpenNI is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -* GNU Lesser General Public License for more details. * -* * -* You should have received a copy of the GNU Lesser General Public License * -* along with OpenNI. If not, see <http://www.gnu.org/licenses/>. * -* * -****************************************************************************/ -#ifndef __NIINTERNALDEFS_H__ -#define __NIINTERNALDEFS_H__ - -#define XN_MOCK_NODE_NAME "Mock" - -#endif // __NIINTERNALDEFS_H__
\ No newline at end of file |