put ANGLE includes in a QtANGLE subdir

otherwise even non-angle builds with pre-generated headers will get them
into their include path, which is Not Good (tm).

Change-Id: Ie98354297baf3564ef82b3d4a32e5763e625b8f2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

src/angle/angle.pro

@@ -6,5 +6,5 @@ SUBDIRS += src
 #  2) If we made a 'QtANGLE' module, the include directory would be flattened which won't work since
 #     we need to support "#include <GLES2/gl2.h>"
 CONFIG += minimal_syncqt
-QMAKE_SYNCQT_OPTIONS = -module KHR -module EGL -module GLES2 -version none
+QMAKE_SYNCQT_OPTIONS = -module QtANGLE/KHR -module QtANGLE/EGL -module QtANGLE/GLES2 -version none
 load(qt_module_headers)

src/angle/src/libEGL/libEGL.pro

@@ -40,5 +40,5 @@ egl_headers.files = \
     $$ANGLE_DIR/include/EGL/egl.h \
     $$ANGLE_DIR/include/EGL/eglext.h \
     $$ANGLE_DIR/include/EGL/eglplatform.h
-egl_headers.path = $$[QT_INSTALL_HEADERS]/EGL
+egl_headers.path = $$[QT_INSTALL_HEADERS]/QtANGLE/EGL
 INSTALLS += egl_headers

src/angle/src/libGLESv2/libGLESv2.pro

@@ -235,12 +235,12 @@ for (vs, CLEAR_SHADERS) {
 load(qt_installs)
 
 khr_headers.files = $$ANGLE_DIR/include/KHR/khrplatform.h
-khr_headers.path = $$[QT_INSTALL_HEADERS]/KHR
+khr_headers.path = $$[QT_INSTALL_HEADERS]/QtANGLE/KHR
 gles2_headers.files = \
     $$ANGLE_DIR/include/GLES2/gl2.h \
     $$ANGLE_DIR/include/GLES2/gl2ext.h \
     $$ANGLE_DIR/include/GLES2/gl2platform.h
-gles2_headers.path = $$[QT_INSTALL_HEADERS]/GLES2
+gles2_headers.path = $$[QT_INSTALL_HEADERS]/QtANGLE/GLES2
 INSTALLS += khr_headers gles2_headers
 
 

src/gui/Qt5GuiConfigExtras.cmake.in

@@ -2,13 +2,15 @@
 !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
 
 !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\")
+set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
 !!ELSE
-set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR\")
+set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
 !!ENDIF
 
 _qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
 
+list(APPEND Qt5Gui_INCLUDE_DIRS ${Qt5Gui_EGL_INCLUDE_DIRS})
+set_property(TARGET Qt5::Gui APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${Qt5Gui_EGL_INCLUDE_DIRS})
 set(Qt5Gui_OPENGL_INCLUDE_DIRS ${Qt5Gui_EGL_INCLUDE_DIRS})
 
 macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATION IMPLIB_LOCATION)

src/gui/gui.pro

@@ -12,6 +12,12 @@ MODULE_PLUGIN_TYPES = \
     platforms \
     imageformats
 
+# This is here only because the platform plugin is no module, obviously.
+win32:contains(QT_CONFIG, angle) {
+    MODULE_AUX_INCLUDES = \
+        \$\$QT_MODULE_INCLUDE_BASE/QtANGLE
+}
+
 load(qt_module)
 
 # Code coverage with TestCocoon

sync.profile

@@ -11,9 +11,9 @@
     "QtDBus" => "$basedir/src/dbus",
     "QtConcurrent" => "$basedir/src/concurrent",
     "QtPlatformSupport" => "$basedir/src/platformsupport",
-    "KHR" => "!$basedir/src/3rdparty/angle/include/KHR",
-    "GLES2" => "!$basedir/src/3rdparty/angle/include/GLES2",
-    "EGL" => "!$basedir/src/3rdparty/angle/include/EGL",
+    "QtANGLE/KHR" => "!$basedir/src/3rdparty/angle/include/KHR",
+    "QtANGLE/GLES2" => "!$basedir/src/3rdparty/angle/include/GLES2",
+    "QtANGLE/EGL" => "!$basedir/src/3rdparty/angle/include/EGL",
     "QtZlib" => "!$basedir/src/3rdparty/zlib",
     "QtOpenGLExtensions" => "$basedir/src/openglextensions",
 );