Move OpenGL/EGL headers into 3rdparty folder

These headers are actually 3rd party code since they come directly from
the Khronos Group.  This fixes issues with the license checker as well.
Documentation and build script are updated to reflect the change in the
header location.

Change-Id: I1e513d7be580dcc3ea987d7fd0a5049fd7255d4e
Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>

13 files changed, 4 insertions, 4 deletions

diff --git a/src/doc/src/qtquick2drenderer-installation-guide.qdoc b/src/doc/src/qtquick2drenderer-installation-guide.qdoc
index 1870964ea7..e18b09272c 100644
--- a/src/doc/src/qtquick2drenderer-installation-guide.qdoc
+++ b/src/doc/src/qtquick2drenderer-installation-guide.qdoc
@@ -87,7 +87,7 @@
     Copy the include folder to the /usr/include folder in your sysroot.  This
     installs the OpenGL/EGL headers:
     \badcode
-    cp -r include/* ${SYSROOT}/usr/include/
+    cp -r 3rdparty/include/* ${SYSROOT}/usr/include/
     \endcode
     Copy \c libEGL.so and \c libGLESv2.so to the /usr/lib folder in your sysroot:
     \badcode
diff --git a/tools/opengldummy/include/EGL/egl.h b/tools/opengldummy/3rdparty/include/EGL/egl.h
index 99ea342a47..99ea342a47 100644
--- a/tools/opengldummy/include/EGL/egl.h
+++ b/tools/opengldummy/3rdparty/include/EGL/egl.h
diff --git a/tools/opengldummy/include/EGL/eglext.h b/tools/opengldummy/3rdparty/include/EGL/eglext.h
index a392b31d9d..a392b31d9d 100644
--- a/tools/opengldummy/include/EGL/eglext.h
+++ b/tools/opengldummy/3rdparty/include/EGL/eglext.h
diff --git a/tools/opengldummy/include/EGL/eglplatform.h b/tools/opengldummy/3rdparty/include/EGL/eglplatform.h
index bcbda98188..bcbda98188 100644
--- a/tools/opengldummy/include/EGL/eglplatform.h
+++ b/tools/opengldummy/3rdparty/include/EGL/eglplatform.h
diff --git a/tools/opengldummy/include/GLES2/gl2.h b/tools/opengldummy/3rdparty/include/GLES2/gl2.h
index f6bed7d1b3..f6bed7d1b3 100644
--- a/tools/opengldummy/include/GLES2/gl2.h
+++ b/tools/opengldummy/3rdparty/include/GLES2/gl2.h
diff --git a/tools/opengldummy/include/GLES2/gl2ext.h b/tools/opengldummy/3rdparty/include/GLES2/gl2ext.h
index 36801bee5c..36801bee5c 100644
--- a/tools/opengldummy/include/GLES2/gl2ext.h
+++ b/tools/opengldummy/3rdparty/include/GLES2/gl2ext.h
diff --git a/tools/opengldummy/include/GLES2/gl2platform.h b/tools/opengldummy/3rdparty/include/GLES2/gl2platform.h
index 89d4d44dc1..89d4d44dc1 100644
--- a/tools/opengldummy/include/GLES2/gl2platform.h
+++ b/tools/opengldummy/3rdparty/include/GLES2/gl2platform.h
diff --git a/tools/opengldummy/include/GLES3/gl3.h b/tools/opengldummy/3rdparty/include/GLES3/gl3.h
index 81b63bd03b..81b63bd03b 100644
--- a/tools/opengldummy/include/GLES3/gl3.h
+++ b/tools/opengldummy/3rdparty/include/GLES3/gl3.h
diff --git a/tools/opengldummy/include/GLES3/gl31.h b/tools/opengldummy/3rdparty/include/GLES3/gl31.h
index 6fe473d818..6fe473d818 100644
--- a/tools/opengldummy/include/GLES3/gl31.h
+++ b/tools/opengldummy/3rdparty/include/GLES3/gl31.h
diff --git a/tools/opengldummy/include/GLES3/gl3platform.h b/tools/opengldummy/3rdparty/include/GLES3/gl3platform.h
index b1e869dd11..b1e869dd11 100644
--- a/tools/opengldummy/include/GLES3/gl3platform.h
+++ b/tools/opengldummy/3rdparty/include/GLES3/gl3platform.h
diff --git a/tools/opengldummy/include/KHR/khrplatform.h b/tools/opengldummy/3rdparty/include/KHR/khrplatform.h
index d976ab546b..d976ab546b 100644
--- a/tools/opengldummy/include/KHR/khrplatform.h
+++ b/tools/opengldummy/3rdparty/include/KHR/khrplatform.h
diff --git a/tools/opengldummy/README b/tools/opengldummy/README
index e00a681a54..c8ca2dc726 100644
--- a/tools/opengldummy/README
+++ b/tools/opengldummy/README
@@ -34,7 +34,7 @@ Target image inteded to be deployed to your device.
 2) Installation of files
         Copy the include folder to the /usr/include folder in your sysroot.  This
         installs the OpenGL/EGL headers:
-	cp -r include/* ${SYSROOT}/usr/include/
+	cp -r 3rdparty/include/* ${SYSROOT}/usr/include/
 	
 	Copy libEGL.so and libGLESv2.so to the /usr/lib folder in your sysroot:
 	cp src/lib*.so ${SYSROOT}/usr/lib/
diff --git a/tools/opengldummy/src/build-gcc.sh b/tools/opengldummy/src/build-gcc.sh
index 6e0e266059..687807d1a6 100755
--- a/tools/opengldummy/src/build-gcc.sh
+++ b/tools/opengldummy/src/build-gcc.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared --sysroot ${SYSROOT} -I../include -o libEGL.so egl.cpp
-${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared --sysroot ${SYSROOT} -I../include -o libGLESv2.so gles2.cpp
+${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared --sysroot ${SYSROOT} -I../3rdparty/include -o libEGL.so egl.cpp
+${CC} -DQGS_BUILD_CLIENT_DLL -fPIC -shared --sysroot ${SYSROOT} -I../3rdparty/include -o libGLESv2.so gles2.cpp