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>

2 files changed, 360 insertions, 0 deletions

diff --git a/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Linux-x86/XnOSLinux-x86.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Linux-x86/XnOSLinux-x86.h
new file mode 100644
index 00000000..0cbd12fc
--- /dev/null
+++ b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Linux-x86/XnOSLinux-x86.h
@@ -0,0 +1,165 @@
+/****************************************************************************
+*                                                                           *
+*  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 _XN_OSLINUX_X86_H_
+#define _XN_OSLINUX_X86_H_
+
+//---------------------------------------------------------------------------
+// Includes
+//---------------------------------------------------------------------------
+#include <sys/types.h>
+#include <stdarg.h>
+#include <time.h>
+#include <pthread.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+//---------------------------------------------------------------------------
+// Files
+//---------------------------------------------------------------------------
+/** A generic handle type. */ 
+typedef	void* XN_HANDLE;
+
+/** A file handle type. */ 
+typedef XnInt XN_FILE_HANDLE;
+
+/** The value of an invalid file handle. */
+#define XN_INVALID_FILE_HANDLE -1
+
+/** A string that specifies the current directory. */ 
+#define XN_FILE_LOCAL_DIR "./"
+
+/** The file directory separator. */ 
+#define XN_FILE_DIR_SEP "/"
+
+/** The file extension separator. */ 
+#define XN_FILE_EXT_SEP "."
+
+/** The file "all" wildcard. */ 
+#define XN_FILE_ALL_WILDCARD "*"
+
+/** The newline separation string. */
+#define XN_NEW_LINE_SEP "\n"
+
+//---------------------------------------------------------------------------
+// INI Files
+//---------------------------------------------------------------------------
+/** A string that specifies the extension of INI files. */ 
+#define XN_INI_FILE_EXT "ini"
+
+/** The maximum allowed INI string length (in bytes). */
+// Note: This must always be big enough to contain a 32-bit number!
+#define XN_INI_MAX_LEN 256
+
+//---------------------------------------------------------------------------
+// Shared Libraries
+//---------------------------------------------------------------------------
+/** A shared library handle type. */ 
+typedef	void* XN_LIB_HANDLE;
+
+/** A string that specifies the prefix of shared library files. */ 
+#define XN_SHARED_LIBRARY_PREFIX "lib"
+
+/** A string that specifies the postfix of shared library files. */ 
+#define XN_SHARED_LIBRARY_POSTFIX ".so"
+
+//---------------------------------------------------------------------------
+// Threads
+//---------------------------------------------------------------------------
+/** A Xiron thread type. */ 
+typedef	pthread_t* XN_THREAD_HANDLE;
+
+/** A Xiron thread ID. */ 
+typedef	pthread_t XN_THREAD_ID;
+
+/** A Xiron process ID. */
+typedef pid_t XN_PROCESS_ID;
+
+/** The thread entry point function prototype. */
+typedef void* (*XN_THREAD_PROC_PROTO)(void* arg);
+
+/** The thread entry point function definition. */
+#define	XN_THREAD_PROC void*
+
+/** The thread return function. */
+#define	XN_THREAD_PROC_RETURN(ret) return((void*)ret)
+
+/** The thread passable data pointer type. */ 
+typedef	void* XN_THREAD_PARAM;
+
+//---------------------------------------------------------------------------
+// Time Outs
+//---------------------------------------------------------------------------
+/** The mutex lock infinite timeout. */
+#define	XN_WAIT_INFINITE 0xFFFFFFFF
+
+//---------------------------------------------------------------------------
+// Mutex
+//---------------------------------------------------------------------------
+/** A Xiron mutex type. */
+struct XnMutex;
+typedef	struct XnMutex* XN_MUTEX_HANDLE;
+
+//---------------------------------------------------------------------------
+// Critical Sections
+//---------------------------------------------------------------------------
+/** A Xiron critical sections type. */ 
+typedef	XN_MUTEX_HANDLE XN_CRITICAL_SECTION_HANDLE;
+
+//---------------------------------------------------------------------------
+// Events
+//---------------------------------------------------------------------------
+/** A Xiron event type. */ 
+struct _XnEvent;
+typedef struct _XnEvent _XnEvent, *XN_EVENT_HANDLE ;
+
+//---------------------------------------------------------------------------
+// Semaphores
+//---------------------------------------------------------------------------
+/** A Xiron event type. */
+struct _XnSemaphore;
+typedef struct _XnSemaphore *XN_SEMAPHORE_HANDLE;
+
+//---------------------------------------------------------------------------
+// Timer
+//---------------------------------------------------------------------------
+/** The Xiron OS timer structure. */ 
+typedef struct XnOSTimer 
+{
+	struct timespec tStartTime;
+	XnBool bHighRes;
+} XnOSTimer;
+
+//---------------------------------------------------------------------------
+// Network
+//---------------------------------------------------------------------------
+/** The network host name and port separator. */ 
+#define XN_NETWORK_HOST_PORT_SEP ":"
+
+//---------------------------------------------------------------------------
+// Swaps
+//---------------------------------------------------------------------------
+#define XN_PREPARE_VAR16_IN_BUFFER(var) (var)
+#define XN_PREPARE_VAR32_IN_BUFFER(var) (var)
+#define XN_PREPARE_VAR64_IN_BUFFER(var) (var)
+#define XN_PREPARE_VAR_FLOAT_IN_BUFFER(var) (var)
+
+#endif //_XN_OSLINUX_X86_H_
diff --git a/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Linux-x86/XnPlatformLinux-x86.h b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Linux-x86/XnPlatformLinux-x86.h
new file mode 100644
index 00000000..1b91a388
--- /dev/null
+++ b/tests/manual/kinectsurface/QtKinectWrapper/OpenNI/Include/Linux-x86/XnPlatformLinux-x86.h
@@ -0,0 +1,195 @@
+/****************************************************************************
+*                                                                           *
+*  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 _XN_PLATFORM_LINUX_X86_H_
+#define _XN_PLATFORM_LINUX_X86_H_
+
+//---------------------------------------------------------------------------
+// Prerequisites
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+// Includes
+//---------------------------------------------------------------------------
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <limits.h>
+
+//---------------------------------------------------------------------------
+// Platform Basic Definition
+//---------------------------------------------------------------------------
+#define XN_PLATFORM XN_PLATFORM_LINUX_X86
+#define XN_PLATFORM_STRING "Linux-x86"
+
+//---------------------------------------------------------------------------
+// Platform Capabilities
+//---------------------------------------------------------------------------
+#define XN_PLATFORM_ENDIAN_TYPE XN_PLATFORM_IS_LITTLE_ENDIAN
+#define XN_PLATFORM_VAARGS_TYPE XN_PLATFORM_USE_GCC_VAARGS_STYLE
+#define XN_PLATFORM_SUPPORTS_DYNAMIC_LIBS 1
+
+//---------------------------------------------------------------------------
+// Basic Types
+//---------------------------------------------------------------------------
+/** Boolean TRUE/FALSE type. */ 
+typedef	unsigned int		XnBool;
+
+/** Signed character for strings. */ 
+typedef	char				XnChar;
+/** Unsigned character for strings. */ 
+typedef	unsigned char		XnUChar;
+
+/** Signed wide character for strings. */ 
+typedef	wchar_t				XnWChar;
+
+/** 8-bit signed integer. */ 
+typedef	signed char			XnInt8;
+/** 8-bit unsigned integer. */ 
+typedef	unsigned char		XnUInt8;
+
+/** 16-bit signed integer. */ 
+typedef	short				XnInt16;
+/** 16-bit unsigned integer. */ 
+typedef	unsigned short		XnUInt16;
+
+/** 32-bit signed integer. */ 
+typedef	int					XnInt32;
+/** 32-bit unsigned integer. */ 
+typedef	unsigned int		XnUInt32;
+
+/** 64-bit signed integer. */ 
+typedef	long long			XnInt64;
+/** 64-bit unsigned integer. */ 
+typedef	unsigned long long	XnUInt64;
+
+/** natural signed integer. */ 
+typedef	int					XnInt;
+/** natural unsigned integer. */ 
+typedef	unsigned int		XnUInt;
+
+/** Float (32bit) */ 
+typedef	float				XnFloat;
+/** Double (64bit) */ 
+typedef	double				XnDouble;
+
+/** Far procedures type (for shared libraries functions). */ 
+typedef void (*XnFarProc)(void *);
+
+/** Size type. */ 
+typedef size_t				XnSizeT;
+
+/** Max unsigned 8-bit value */ 
+#define XN_MAX_UINT8 UCHAR_MAX
+/** Max unsigned 16-bit value */ 
+#define XN_MAX_UINT16 USHRT_MAX
+/** Max unsigned 32-bit value */ 
+#define XN_MAX_UINT32 UINT_MAX
+/** Max unsigned 64-bit value */ 
+#define XN_MAX_UINT64 ULLONG_MAX
+
+/** Min signed 8-bit value */ 
+#define XN_MIN_INT8 SCHAR_MIN
+/** Min signed 16-bit value */ 
+#define XN_MIN_INT16 SHRT_MIN
+/** Min signed 32-bit value */ 
+#define XN_MIN_INT32 INT_MIN
+/** Min signed 64-bit value */ 
+#define XN_MIN_INT64 LLONG_MIN
+
+/** Max signed 8-bit value */ 
+#define XN_MAX_INT8 SCHAR_MAX
+/** Max signed 16-bit value */ 
+#define XN_MAX_INT16 SHRT_MAX
+/** Max signed 32-bit value */ 
+#define XN_MAX_INT32 INT_MAX
+/** Max signed 64-bit value */ 
+#define XN_MAX_INT64 LLONG_MAX
+
+//---------------------------------------------------------------------------
+// Memory
+//---------------------------------------------------------------------------
+/** The default memory alignment. */ 
+#define XN_DEFAULT_MEM_ALIGN 16
+
+/** The thread static declarator (using TLS). */
+#define XN_THREAD_STATIC __thread
+
+//---------------------------------------------------------------------------
+// Files
+//---------------------------------------------------------------------------
+/** The maximum allowed file path size (in bytes). */ 
+#define XN_FILE_MAX_PATH 256
+
+//---------------------------------------------------------------------------
+// Call back
+//---------------------------------------------------------------------------
+/** The std call type. */ 
+#define XN_STDCALL __stdcall
+
+/** The call back calling convention. */ 
+#define XN_CALLBACK_TYPE
+
+/** The C and C++ calling convension. */
+#define XN_C_DECL
+
+//---------------------------------------------------------------------------
+// Macros
+//---------------------------------------------------------------------------
+/** Returns the date and time at compile time. */ 
+#define XN_TIMESTAMP __DATE__ " " __TIME__
+
+/** Converts n into a pre-processor string.  */ 
+#define XN_STRINGIFY(n) XN_STRINGIFY_HELPER(n)
+#define XN_STRINGIFY_HELPER(n) #n
+
+/** Asserts an expression, only on Debug build. */
+#define XN_ASSERT(x)
+
+//---------------------------------------------------------------------------
+// API Export/Import Macros
+//---------------------------------------------------------------------------
+/** Indicates an exported shared library function. */ 
+#define XN_API_EXPORT __attribute__ ((visibility("default")))
+	
+/** Indicates an imported shared library function. */ 
+#define XN_API_IMPORT 
+
+/** Indicates a deprecated function */
+#define XN_API_DEPRECATED(msg) __attribute__((warning("This function is deprecated: " msg)))
+
+#define XN_DEPRECATED_WARNING_IDS			
+#define XN_HIDES_PARENT_METHOD_WARNING_ID	
+#define XN_CONDITION_IS_CONST_WARNING_ID
+#define XN_INHERITS_VIA_DOMINANCE_WARNING_ID
+#define XN_UNALIGNED_ADDRESS_WARNING_ID
+#define XN_STRUCT_PADDED_WARNING_ID
+
+#define XN_PRAGMA_START_DISABLED_WARNING_SECTION(warnings)
+#define XN_PRAGMA_STOP_DISABLED_WARNING_SECTION
+
+/** Declares a global shared library export function. */ 
+#define XN_API_EXPORT_INIT()
+
+#endif //_XN_PLATFORM_LINUX_X86_H_
+